[profiles] Make kSessionExitedCleanly pref obsolete

kSessionExitedCleanly pref is deprecated but still checked in the code
as a fallback. The code contains a TODO to remove this pref around M28
release which makes me believe that this fallback is no longer needed.

The pref should be deleted from disk though, so this CL moves it
into the MigrateObsoleteProfilePrefs() function that takes care of it.

Change-Id: I84cddb655dd50d23578d4b9020d3efb9ca652ea5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2891790
Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Alex Ilin <alexilin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#882093}

chrome/browser/prefs/browser_prefs.cc

@@ -565,10 +565,11 @@ const char kTranslateLastDeniedTimeForLanguage[] =
 const char kTranslateTooOftenDeniedForLanguage[] =
     "translate_too_often_denied_for_language";
 
-#if BUILDFLAG(ENABLE_EXTENSIONS)
 // Deprecated 05/2021.
+#if BUILDFLAG(ENABLE_EXTENSIONS)
 const char kToolbarSize[] = "extensions.toolbarsize";
 #endif
+const char kSessionExitedCleanly[] = "profile.exited_cleanly";
 
 // Register local state used only for migration (clearing or moving to a new
 // key).
@@ -698,6 +699,7 @@ void RegisterProfilePrefsForMigration(
 #if BUILDFLAG(ENABLE_EXTENSIONS)
   registry->RegisterIntegerPref(kToolbarSize, -1);
 #endif
+  registry->RegisterBooleanPref(kSessionExitedCleanly, true);
 }
 
 }  // namespace
@@ -1407,10 +1409,11 @@ void MigrateObsoleteProfilePrefs(Profile* profile) {
   profile_prefs->ClearPref(kTranslateLastDeniedTimeForLanguage);
   profile_prefs->ClearPref(kTranslateTooOftenDeniedForLanguage);
 
-#if BUILDFLAG(ENABLE_EXTENSIONS)
   // Added 05/2021.
+#if BUILDFLAG(ENABLE_EXTENSIONS)
   profile_prefs->ClearPref(kToolbarSize);
 #endif
+  profile_prefs->ClearPref(kSessionExitedCleanly);
 
   // Please don't delete the following line. It is used by PRESUBMIT.py.
   // END_MIGRATE_OBSOLETE_PROFILE_PREFS

chrome/browser/profiles/profile.cc

@@ -287,7 +287,6 @@ void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
       std::string(),
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
 #endif  // defined(OS_ANDROID)
-  registry->RegisterBooleanPref(prefs::kSessionExitedCleanly, true);
   registry->RegisterStringPref(prefs::kSessionExitType, std::string());
   registry->RegisterBooleanPref(prefs::kDisableExtensions, false);
 #if BUILDFLAG(ENABLE_EXTENSIONS)

chrome/browser/profiles/profile_impl.cc

@@ -301,7 +301,7 @@ base::Time CreateProfileDirectory(base::SequencedTaskRunner* io_task_runner,
   return base::Time::Now();
 }
 
-// Converts the kSessionExitedCleanly pref to the corresponding EXIT_TYPE.
+// Converts the `kSessionExitType` pref to the corresponding EXIT_TYPE.
 Profile::ExitType SessionTypePrefValueToExitType(const std::string& value) {
   if (value == kPrefExitTypeSessionEnded)
     return Profile::EXIT_SESSION_ENDED;
@@ -1080,23 +1080,10 @@ void ProfileImpl::OnLocaleReady() {
   }
 #endif
 
-  // |kSessionExitType| was added after |kSessionExitedCleanly|. If the pref
-  // value is empty fallback to checking for |kSessionExitedCleanly|.
-  const std::string exit_type_pref_value(
+  last_session_exit_type_ = SessionTypePrefValueToExitType(
       prefs_->GetString(prefs::kSessionExitType));
-  if (exit_type_pref_value.empty()) {
-    last_session_exit_type_ = prefs_->GetBoolean(prefs::kSessionExitedCleanly)
-                                  ? EXIT_NORMAL
-                                  : EXIT_CRASHED;
-  } else {
-    last_session_exit_type_ =
-        SessionTypePrefValueToExitType(exit_type_pref_value);
-  }
   // Mark the session as open.
   prefs_->SetString(prefs::kSessionExitType, kPrefExitTypeCrashed);
-  // Force this to true in case we fallback and use it.
-  // TODO(sky): remove this in a couple of releases (m28ish).
-  prefs_->SetBoolean(prefs::kSessionExitedCleanly, true);
 
   g_browser_process->profile_manager()->InitProfileUserPrefs(this);
 

chrome/common/pref_names.cc

@@ -88,13 +88,6 @@ const char kNewTabPageLocationOverride[] = "newtab_page_location_override";
 // determine the state of the profile icon for icon format changes.
 const char kProfileIconVersion[] = "profile.icon_version";
 
-// Used to determine if the last session exited cleanly. Set to false when
-// first opened, and to true when closing. On startup if the value is false,
-// it means the profile didn't exit cleanly.
-// DEPRECATED: this is replaced by kSessionExitType and exists for backwards
-// compatibility.
-const char kSessionExitedCleanly[] = "profile.exited_cleanly";
-
 // A string pref whose values is one of the values defined by
 // |ProfileImpl::kPrefExitTypeXXX|. Set to |kPrefExitTypeCrashed| on startup and
 // one of |kPrefExitTypeNormal| or |kPrefExitTypeSessionEnded| during

chrome/common/pref_names.h

@@ -41,7 +41,6 @@ extern const char kChromeCleanerScanCompletionTime[];
 extern const char kNewTabPageLocationOverride[];
 extern const char kProfileIconVersion[];
 extern const char kRestoreOnStartup[];
-extern const char kSessionExitedCleanly[];
 extern const char kSessionExitType[];
 #if !defined(OS_ANDROID)
 extern const char kManagedSerialAllowAllPortsForUrls[];