Move tracked prefs into services/preferences/tracked.

services/preferences/tracked/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # 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",
     "device_id_stub.cc",
     "device_id_win.cc",
     "dictionary_hash_store_contents.cc",
     "dictionary_hash_store_contents.h",
     "hash_store_contents.h",
     "interceptable_pref_filter.cc",
     "interceptable_pref_filter.h",
     "pref_hash_calculator.cc",
     "pref_hash_calculator.h",
     "pref_hash_filter.cc",
     "pref_hash_filter.h",
     "pref_hash_store.h",
     "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",
     "segregated_pref_store.h",
     "tracked_atomic_preference.cc",
     "tracked_atomic_preference.h",
     "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",
     "tracked_split_preference.h",
   ]
 
   if (is_win || is_mac) {
     sources -= [ "device_id_stub.cc" ]
   }
 
   # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
   configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
 
   public_deps = [
+    "//services/preferences/public/cpp/tracked",
     "//services/preferences/public/interfaces",
   ]
 
   deps = [
     "//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",
-  ]
-
-  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") {
   testonly = true
   sources = [
     "device_id_unittest.cc",
     "pref_hash_calculator_unittest.cc",
     "pref_hash_filter_unittest.cc",
     "pref_hash_store_impl_unittest.cc",
     "registry_hash_store_contents_win_unittest.cc",
     "segregated_pref_store_unittest.cc",
     "tracked_preferences_migration_unittest.cc",
   ]
 
   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",
   ]
 }