Revert "Eliminate all code related to the AutomaticProfileResetter."

chrome/browser/prefs/chrome_pref_service_factory.cc

Index: chrome/browser/prefs/chrome_pref_service_factory.cc
diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browser/prefs/chrome_pref_service_factory.cc
index 81b2c6670c8f92deaf05cf5067846753f6acb13f..b50fee698c680555979992d4ce4ebd7df4fa213e 100644
--- a/chrome/browser/prefs/chrome_pref_service_factory.cc
+++ b/chrome/browser/prefs/chrome_pref_service_factory.cc
@@ -154,6 +154,11 @@ const PrefHashFilter::TrackedPreferenceMetadata kTrackedPrefs[] = {
   },
 #endif
   {
+    13, prefs::kProfileResetPromptMemento,
+    PrefHashFilter::ENFORCE_ON_LOAD,
+    PrefHashFilter::TRACKING_STRATEGY_ATOMIC

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

This should be okay; either it got cleared, or it still exists and has a valid
MAC (i.e. the last Chrome that ran had this as a protected pref).

Even safer/cleaner would be to use new pref names though IMO as suggested above.

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

I went for a middle-ground solution, please see my response to the comment
before.

+  },
+  {
     14, DefaultSearchManager::kDefaultSearchProviderDataPrefName,
     PrefHashFilter::NO_ENFORCEMENT,
     PrefHashFilter::TRACKING_STRATEGY_ATOMIC