Revert "Eliminate all code related to the AutomaticProfileResetter."

chrome/browser/prefs/browser_prefs.cc

Index: chrome/browser/prefs/browser_prefs.cc
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 4543696275af8911abd08c58c616e083e044a2f9..bb648f05c3ce38af22d0f8bc9df162643d852a0d 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -135,6 +135,7 @@
 #include "chrome/browser/android/new_tab_page_prefs.h"
 #else
 #include "chrome/browser/notifications/sync_notifier/chrome_notifier_service.h"
+#include "chrome/browser/profile_resetter/automatic_profile_resetter_factory.h"
 #include "chrome/browser/ui/autofill/generated_credit_card_bubble_controller.h"
 #endif
 
@@ -220,12 +221,6 @@ const char kBackupPref[] = "backup";
 // The sync promo error message preference has been removed; this pref will
 // be cleared from user data.
 const char kSyncPromoErrorMessage[] = "sync_promo.error_message";
-
-// The AutomaticProfileResetter service, which has since been unimplemented,
-// used this preference to save that the profile reset prompt had already been
-// shown. We keep the name here for now so that we can clear out legacy values.
-// TODO(engedy): Remove this and usages in M42 or later. See crbug.com/398813.
-const char kProfileResetPromptMemento[] = "profile.reset_prompt_memento";

[gab, 2014/09/03 14:51:39]

Shall we instead use a new pref name? I think it was particularly wrong
previously to use the same pref name for two different things in Local State and
Preferences.

I'd keep clearing this one and use two new names for the Local State and
Preferences prefs.

[engedy, 2014/09/04 11:59:45]

For Profile Prefs, I think the current name is very descriptive, and could not
come up with anything better, therefore I would like to keep it. For Local
State, I have changed the name to be in plural. This means that the pref in
Profile Prefs would get resurrected.

WDYT?

 #endif
 
 }  // namespace
@@ -290,6 +285,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
 #endif  // defined(ENABLE_TASK_MANAGER)
 
 #if !defined(OS_ANDROID)
+  AutomaticProfileResetterFactory::RegisterPrefs(registry);
   BackgroundModeManager::RegisterPrefs(registry);
   RegisterBrowserPrefs(registry);
 #if !defined(OS_CHROMEOS)
@@ -347,12 +343,6 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
 #if defined(TOOLKIT_VIEWS)
   RegisterBrowserViewLocalPrefs(registry);
 #endif
-
-  // Preferences registered only for migration (clearing or moving to a new key)
-  // go here.
-#if !defined(OS_ANDROID)
-  registry->RegisterDictionaryPref(kProfileResetPromptMemento);
-#endif  // !defined(OS_ANDROID)
 }
 
 // Register prefs applicable to all profiles.
@@ -483,8 +473,8 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
   ash::RegisterChromeLauncherUserPrefs(registry);
 #endif
 
-  // Preferences registered only for migration (clearing or moving to a new key)
-  // go here.
+  // Prefs registered only for migration (clearing or moving to a new
+  // key) go here.

[gab, 2014/09/03 14:51:39]

Leave this as it had been fixed.

[engedy, 2014/09/04 11:59:45]

Done.

   registry->RegisterDictionaryPref(
       kBackupPref,
       new base::DictionaryValue(),
@@ -602,10 +592,6 @@ void MigrateBrowserPrefs(Profile* profile, PrefService* local_state) {
                             current_version);
   }
 
-#if !defined(OS_ANDROID)
-  local_state->ClearPref(kProfileResetPromptMemento);
-#endif
-
 #if defined(OS_CHROMEOS)
   chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state);
 #endif