Introduce a new framework for back-and-forth tracked/protected preferences migration.

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 b057bbcb2cad668acf33a4370897608fdf6735ec..8643c47f380aafc41eb0074df8457f7344026572 100644
--- a/chrome/browser/prefs/chrome_pref_service_factory.cc
+++ b/chrome/browser/prefs/chrome_pref_service_factory.cc
@@ -151,10 +151,25 @@ const PrefHashFilter::TrackedPreferenceMetadata kTrackedPrefs[] = {
     PrefHashFilter::ENFORCE_ON_LOAD,
     PrefHashFilter::TRACKING_STRATEGY_ATOMIC
   },
+  {
+    // Protecting kPreferenceResetTime does two things:
+    //  1) It ensures this isn't accidently set by someone stomping the pref
+    //     file.
+    //  2) More importantly, it declares kPreferenceResetTime as a protected
+    //     pref which is required for it to be visible when queried via the
+    //     SegregatedPrefStore. This is because it's written directly in the
+    //     protected JsonPrefStore by that store's PrefHashFilter if there was
+    //     a reset in FilterOnLoad and SegregatedPrefStore will not look for it
+    //     in the protected JsonPrefStore unless it's declared as a protected
+    //     preference here.
+    14, prefs::kPreferenceResetTime,
+    PrefHashFilter::ENFORCE_ON_LOAD,
+    PrefHashFilter::TRACKING_STRATEGY_ATOMIC
+  },
 };
 
 // The count of tracked preferences IDs across all platforms.
-const size_t kTrackedPrefsReportingIDsCount = 14;
+const size_t kTrackedPrefsReportingIDsCount = 15;
 COMPILE_ASSERT(kTrackedPrefsReportingIDsCount >= arraysize(kTrackedPrefs),
                need_to_increment_ids_count);