Move tracked prefs into services/preferences/tracked.

services/preferences/tracked/BUILD.gn

Index: services/preferences/tracked/BUILD.gn
diff --git a/components/user_prefs/tracked/BUILD.gn b/services/preferences/tracked/BUILD.gn
similarity index 79%
rename from components/user_prefs/tracked/BUILD.gn
rename to services/preferences/tracked/BUILD.gn
index c1022463af7cc0fec653fcd2e0689d02eed7cd72..003ef30522baabd6e47d0d7cf994fa97ea6c77dc 100644
--- a/components/user_prefs/tracked/BUILD.gn
+++ b/services/preferences/tracked/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-static_library("user_prefs_tracked") {
+source_set("tracked") {
   sources = [
     "device_id.h",
     "device_id_mac.cc",
@@ -21,8 +21,6 @@ static_library("user_prefs_tracked") {
     "pref_hash_store_impl.cc",
     "pref_hash_store_impl.h",
     "pref_hash_store_transaction.h",
-    "pref_names.cc",
-    "pref_names.h",
     "registry_hash_store_contents_win.cc",
     "registry_hash_store_contents_win.h",
     "segregated_pref_store.cc",
@@ -32,8 +30,6 @@ static_library("user_prefs_tracked") {
     "tracked_preference.h",
     "tracked_preference_helper.cc",
     "tracked_preference_helper.h",
-    "tracked_preference_histogram_names.cc",
-    "tracked_preference_histogram_names.h",
     "tracked_preferences_migration.cc",
     "tracked_preferences_migration.h",
     "tracked_split_preference.cc",
@@ -48,28 +44,20 @@ static_library("user_prefs_tracked") {
   configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
 
   public_deps = [
+    "//services/preferences/public/cpp/tracked",
     "//services/preferences/public/interfaces",
   ]
 
   deps = [
-    "//base:base",
+    "//base",
     "//components/pref_registry",
     "//components/prefs",
-    "//crypto:crypto",
-  ]
-}
-
-static_library("user_prefs_tracked_test_support") {
-  testonly = true
-  sources = [
-    "mock_validation_delegate.cc",
-    "mock_validation_delegate.h",
+    "//crypto",
   ]
 
-  deps = [
-    ":user_prefs_tracked",
-    "//base:base",
-  ]
+  if (is_mac) {
+    libs = [ "IOKit.framework" ]
+  }
 }
 
 source_set("unit_tests") {
@@ -85,11 +73,11 @@ source_set("unit_tests") {
   ]
 
   deps = [
-    ":user_prefs_tracked",
-    ":user_prefs_tracked_test_support",
-    "//base:base",
+    ":tracked",
+    "//base",
     "//base/test:test_support",
     "//components/prefs:test_support",
+    "//services/preferences/public/cpp/tracked:test_support",
     "//testing/gtest",
   ]
 }