Eliminate all code related to the AutomaticProfileResetter.

chrome/browser/prefs/browser_prefs.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/prefs/browser_prefs.h"
 
 #include <string>
 
 #include "base/debug/trace_event.h"
 #include "base/prefs/pref_registry_simple.h"
@@ skipping 118 matching lines @@
 
 #if defined(ENABLE_PLUGIN_INSTALLATION)
 #include "chrome/browser/plugins/plugins_resource_service.h"
 #endif
 
 #if defined(OS_ANDROID)
 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h"
 #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
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
 #include "chrome/browser/chromeos/attestation/platform_verification_flow.h"
 #include "chrome/browser/chromeos/audio/audio_devices_pref_handler_impl.h"
 #include "chrome/browser/chromeos/customization_document.h"
 #include "chrome/browser/chromeos/display/display_preferences.h"
 #include "chrome/browser/chromeos/extensions/echo_private_api.h"
@@ skipping 64 matching lines @@
 // chrome/browser/protector/protected_prefs_watcher.cc in source
 // control history) used this string as a prefix for various prefs it
 // registered. We keep it here for now to clear out those old prefs in
 // MigrateUserPrefs.
 const char kBackupPref[] = "backup";
 
 #if !defined(OS_ANDROID)
 // 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 been unimplemented, used to
+// use 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
+// that might be retained in Preferences and/or Local State.
+// TODO(engedy): Remove this and all usages at one point. See crbug.com/398813.

[battre, 2014/07/30 12:53:28]

Please specify a milestone ("at or after Mxx")

[engedy, 2014/07/30 13:52:52]

Done.

+const char kProfileResetPromptMemento[] = "profile.reset_prompt_memento";
 #endif
 
 }  // namespace
 
 namespace chrome {
 
 void RegisterLocalState(PrefRegistrySimple* registry) {
   // Prefs in Local State.
   registry->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0);
 
@@ skipping 45 matching lines @@
 
 #if defined(ENABLE_PLUGIN_INSTALLATION)
   PluginsResourceService::RegisterPrefs(registry);
 #endif
 
 #if defined(ENABLE_TASK_MANAGER)
   TaskManager::RegisterPrefs(registry);
 #endif  // defined(ENABLE_TASK_MANAGER)
 
 #if !defined(OS_ANDROID)
-  AutomaticProfileResetterFactory::RegisterPrefs(registry);
   BackgroundModeManager::RegisterPrefs(registry);
   RegisterBrowserPrefs(registry);
 #if !defined(OS_CHROMEOS)
   RegisterDefaultBrowserPromptPrefs(registry);
 #endif  // !defined(OS_CHROMEOS)
 #endif  // !defined(OS_ANDROID)
 
 #if defined(OS_CHROMEOS)
   ChromeOSMetricsProvider::RegisterPrefs(registry);
   chromeos::AudioDevicesPrefHandlerImpl::RegisterPrefs(registry);
@@ skipping 36 matching lines @@
 
 #if defined(OS_WIN)
   app_metro_launch::RegisterPrefs(registry);
   component_updater::RegisterPrefsForSwReporter(registry);
   password_manager::PasswordManager::RegisterLocalPrefs(registry);
 #endif
 
 #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.
 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
   TRACE_EVENT0("browser", "chrome::RegisterUserPrefs");
   // User prefs. Please keep this list alphabetized.
   autofill::AutofillManager::RegisterProfilePrefs(registry);
   bookmarks::RegisterProfilePrefs(registry);
   sync_driver::SyncPrefs::RegisterProfilePrefs(registry);
   ChromeContentBrowserClient::RegisterProfilePrefs(registry);
@@ skipping 113 matching lines @@
 
 #if defined(TOOLKIT_VIEWS)
   RegisterBrowserViewProfilePrefs(registry);
   RegisterInvertBubbleUserPrefs(registry);
 #endif
 
 #if defined(USE_ASH)
   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(),
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 #if !defined(OS_ANDROID)
   registry->RegisterStringPref(
       kSyncPromoErrorMessage,
       std::string(),
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterStringPref(
+      kProfileResetPromptMemento,
+      std::string(),
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 #endif
 }
 
 void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
   RegisterProfilePrefs(registry);
 
 #if defined(OS_CHROMEOS)
   chromeos::PowerPrefs::RegisterUserProfilePrefs(registry);
 #endif
 }
@@ skipping 15 matching lines @@
 
   // Cleanup prefs from now-removed protector feature.
   prefs->ClearPref(kBackupPref);
 
 #if !defined(OS_ANDROID)
   // Cleanup now-removed sync promo error message preference.
   // TODO(fdoray): Remove this when it's safe to do so (crbug.com/268442).
   prefs->ClearPref(kSyncPromoErrorMessage);
 #endif
 
+#if !defined(OS_ANDROID)
+  prefs->ClearPref(kProfileResetPromptMemento);
+#endif
+
   PromoResourceService::MigrateUserPrefs(prefs);
   translate::TranslatePrefs::MigrateUserPrefs(prefs, prefs::kAcceptLanguages);
 
 #if defined(OS_MACOSX) && !defined(OS_IOS)
   autofill::AutofillManager::MigrateUserPrefs(prefs);
 #endif  // defined(OS_MACOSX) && !defined(OS_IOS)
 }
 
 void MigrateBrowserPrefs(Profile* profile, PrefService* local_state) {
   // Copy pref values which have been migrated to user_prefs from local_state,
@@ skipping 48 matching lines @@
           prefs::kLastPromptedGoogleURL,
           local_state->GetString(prefs::kLastPromptedGoogleURL));
     }
     local_state->ClearPref(prefs::kLastPromptedGoogleURL);
 
     current_version |= GOOGLE_URL_TRACKER_PREFS;
     local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
                             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
 
 #if defined(TOOLKIT_VIEWS)
   MigrateBrowserTabStripPrefs(local_state);
 #endif
 }
 
 }  // namespace chrome