Move tracked prefs into services/preferences/tracked.

services/preferences/tracked/pref_hash_filter.cc

Index: services/preferences/tracked/pref_hash_filter.cc
diff --git a/components/user_prefs/tracked/pref_hash_filter.cc b/services/preferences/tracked/pref_hash_filter.cc
similarity index 89%
rename from components/user_prefs/tracked/pref_hash_filter.cc
rename to services/preferences/tracked/pref_hash_filter.cc
index f697fb85ef171aee155580c0209e94b578cc5673..69e622e8b3c8e841ceab793323e6fde473590f7b 100644
--- a/components/user_prefs/tracked/pref_hash_filter.cc
+++ b/services/preferences/tracked/pref_hash_filter.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/user_prefs/tracked/pref_hash_filter.h"
+#include "services/preferences/tracked/pref_hash_filter.h"
 
 #include <stdint.h>
 #include <algorithm>
@@ -19,12 +19,12 @@
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/prefs/pref_service.h"
 #include "components/prefs/pref_store.h"
-#include "components/user_prefs/tracked/dictionary_hash_store_contents.h"
-#include "components/user_prefs/tracked/pref_hash_store.h"
-#include "components/user_prefs/tracked/pref_hash_store_transaction.h"
-#include "components/user_prefs/tracked/pref_names.h"
-#include "components/user_prefs/tracked/tracked_atomic_preference.h"
-#include "components/user_prefs/tracked/tracked_split_preference.h"
+#include "services/preferences/public/cpp/tracked/pref_names.h"
+#include "services/preferences/tracked/dictionary_hash_store_contents.h"
+#include "services/preferences/tracked/pref_hash_store.h"
+#include "services/preferences/tracked/pref_hash_store_transaction.h"
+#include "services/preferences/tracked/tracked_atomic_preference.h"
+#include "services/preferences/tracked/tracked_split_preference.h"
 
 namespace {
 
@@ -35,10 +35,8 @@ void CleanupDeprecatedTrackedPreferences(
   // up from both the pref files and the hash store.
   static const char* const kDeprecatedTrackedPreferences[] = {
       // TODO(a-v-y): Remove in M60+,
-      "default_search_provider.search_url",
-      "default_search_provider.name",
-      "default_search_provider.keyword"
-  };
+      "default_search_provider.search_url", "default_search_provider.name",
+      "default_search_provider.keyword"};
 
   for (size_t i = 0; i < arraysize(kDeprecatedTrackedPreferences); ++i) {
     const char* key = kDeprecatedTrackedPreferences[i];
@@ -49,10 +47,14 @@ void CleanupDeprecatedTrackedPreferences(
 
 }  // namespace
 
+using PrefTrackingStrategy =
+    prefs::mojom::TrackedPreferenceMetadata::PrefTrackingStrategy;
+
 PrefHashFilter::PrefHashFilter(
     std::unique_ptr<PrefHashStore> pref_hash_store,
     StoreContentsPair external_validation_hash_store_pair,
-    const std::vector<TrackedPreferenceMetadata>& tracked_preferences,
+    const std::vector<prefs::mojom::TrackedPreferenceMetadataPtr>&
+        tracked_preferences,
     const base::Closure& on_reset_on_load,
     prefs::mojom::TrackedPreferenceValidationDelegate* delegate,
     size_t reporting_ids_count,
@@ -74,27 +76,20 @@ PrefHashFilter::PrefHashFilter(
           external_validation_hash_store_pair_->second));
 
   for (size_t i = 0; i < tracked_preferences.size(); ++i) {
-    const TrackedPreferenceMetadata& metadata = tracked_preferences[i];
+    const prefs::mojom::TrackedPreferenceMetadata& metadata =
+        *tracked_preferences[i];
 
     std::unique_ptr<TrackedPreference> tracked_preference;
     switch (metadata.strategy) {
       case PrefTrackingStrategy::ATOMIC:
-        tracked_preference.reset(
-            new TrackedAtomicPreference(metadata.name,
-                                        metadata.reporting_id,
-                                        reporting_ids_count,
-                                        metadata.enforcement_level,
-                                        metadata.value_type,
-                                        delegate));
+        tracked_preference.reset(new TrackedAtomicPreference(
+            metadata.name, metadata.reporting_id, reporting_ids_count,
+            metadata.enforcement_level, metadata.value_type, delegate));
         break;
       case PrefTrackingStrategy::SPLIT:
-        tracked_preference.reset(
-            new TrackedSplitPreference(metadata.name,
-                                       metadata.reporting_id,
-                                       reporting_ids_count,
-                                       metadata.enforcement_level,
-                                       metadata.value_type,
-                                       delegate));
+        tracked_preference.reset(new TrackedSplitPreference(
+            metadata.name, metadata.reporting_id, reporting_ids_count,
+            metadata.enforcement_level, metadata.value_type, delegate));
         break;
     }
     DCHECK(tracked_preference);
@@ -227,8 +222,8 @@ void PrefHashFilter::FinalizeFilterOnLoad(
               external_validation_hash_store_pair_->second.get());
     }
 
-    CleanupDeprecatedTrackedPreferences(
-        pref_store_contents.get(), hash_store_transaction.get());
+    CleanupDeprecatedTrackedPreferences(pref_store_contents.get(),
+                                        hash_store_transaction.get());
 
     if (report_super_mac_validity_) {
       UMA_HISTOGRAM_BOOLEAN("Settings.HashesDictionaryTrusted",