Index: chrome/browser/prefs/browser_prefs.cc |
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc |
index dfdb4ae803749ec10fec75b5e4367ff65785a5e8..9a2c3c4fbe02e914d316d308a333bdc947006190 100644 |
--- a/chrome/browser/prefs/browser_prefs.cc |
+++ b/chrome/browser/prefs/browser_prefs.cc |
@@ -136,7 +136,6 @@ |
#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 |
@@ -286,7 +285,6 @@ 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) |
@@ -343,6 +341,12 @@ 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(prefs::kProfileResetPromptMemento); |
+ #endif // !defined(OS_ANDROID) |
} |
// Register prefs applicable to all profiles. |
@@ -476,8 +480,8 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { |
ash::RegisterChromeLauncherUserPrefs(registry); |
#endif |
- // Prefs registered only for migration (clearing or moving to a new |
- // key) go here. |
+ // Preferences registered only for migration (clearing or moving to a new key) |
+ // go here. |
registry->RegisterDictionaryPref( |
kBackupPref, |
new base::DictionaryValue(), |
@@ -487,6 +491,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { |
kSyncPromoErrorMessage, |
std::string(), |
user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
+ registry->RegisterStringPref( |
+ prefs::kProfileResetPromptMemento, |
+ std::string(), |
+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
#endif |
} |
@@ -522,6 +530,10 @@ void MigrateUserPrefs(Profile* profile) { |
prefs->ClearPref(kSyncPromoErrorMessage); |
#endif |
+#if !defined(OS_ANDROID) |
+ prefs->ClearPref(prefs::kProfileResetPromptMemento); |
+#endif |
+ |
PromoResourceService::MigrateUserPrefs(prefs); |
translate::TranslatePrefs::MigrateUserPrefs(prefs, prefs::kAcceptLanguages); |
@@ -590,6 +602,10 @@ void MigrateBrowserPrefs(Profile* profile, PrefService* local_state) { |
current_version); |
} |
+#if !defined(OS_ANDROID) |
+ local_state->ClearPref(prefs::kProfileResetPromptMemento); |
+#endif |
+ |
#if defined(OS_CHROMEOS) |
chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); |
#endif |