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 81%
rename from components/user_prefs/tracked/BUILD.gn
rename to services/preferences/tracked/BUILD.gn
index c1022463af7cc0fec653fcd2e0689d02eed7cd72..116b6435a06526f007f89752d02702f0610da365 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,6 +44,7 @@ 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",
   ]
 
@@ -57,19 +54,10 @@ static_library("user_prefs_tracked") {
     "//components/prefs",
     "//crypto:crypto",
   ]
-}
-
-static_library("user_prefs_tracked_test_support") {
-  testonly = true
-  sources = [
-    "mock_validation_delegate.cc",
-    "mock_validation_delegate.h",
-  ]
 
-  deps = [
-    ":user_prefs_tracked",
-    "//base:base",
-  ]
+  if (is_mac) {
+    libs = [ "IOKit.framework" ]
+  }

[gab, 2017/03/30 14:56:34]

This wasn't needed in the component before? Why now?

[Sam McNally, 2017/03/31 02:55:51]

I think it was always required, but something else in the same binary or shared
library it was linked into included IOKit. In component builds, this appears not
to be the case for service_unittests.

 }
 
 source_set("unit_tests") {
@@ -85,11 +73,11 @@ source_set("unit_tests") {
   ]
 
   deps = [
-    ":user_prefs_tracked",
-    ":user_prefs_tracked_test_support",
+    ":tracked",
     "//base:base",
     "//base/test:test_support",
     "//components/prefs:test_support",
+    "//services/preferences/public/cpp/tracked:test_support",
     "//testing/gtest",
   ]
 }