| Index: chrome/browser/prefs/browser_prefs.cc
|
| diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
|
| index 71fcc2bb3e34abd8708d33cd6176f5e9eb682aaa..72dab2c3833d9677a36ab2a9c18103be691fa881 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
|
|
|
| @@ -221,6 +220,12 @@ 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";
|
| #endif
|
|
|
| } // namespace
|
| @@ -286,7 +291,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 +347,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(kProfileResetPromptMemento);
|
| +#endif // !defined(OS_ANDROID)
|
| }
|
|
|
| // Register prefs applicable to all profiles.
|
| @@ -476,8 +486,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(),
|
| @@ -590,6 +600,10 @@ 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
|
|
|