Revert of Move base/prefs to components/prefs

components/components_tests.gyp

Index: components/components_tests.gyp
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index ccf39e590873bfd414563c07bf228cdd9100412a..1523a53b0fc052c058c2e3207462720127f822f3 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -584,18 +584,6 @@
       'proxy_config/pref_proxy_config_tracker_impl_unittest.cc',
       'proxy_config/proxy_config_dictionary_unittest.cc',
       'proxy_config/proxy_prefs_unittest.cc',
-    ],
-    'prefs_unittest_sources': [
-      'prefs/default_pref_store_unittest.cc',
-      'prefs/json_pref_store_unittest.cc',
-      'prefs/overlay_user_pref_store_unittest.cc',
-      'prefs/pref_change_registrar_unittest.cc',
-      'prefs/pref_member_unittest.cc',
-      'prefs/pref_notifier_impl_unittest.cc',
-      'prefs/pref_service_unittest.cc',
-      'prefs/pref_value_map_unittest.cc',
-      'prefs/pref_value_store_unittest.cc',
-      'prefs/scoped_user_pref_update_unittest.cc',
     ],
     'query_parser_unittest_sources': [
       'query_parser/query_parser_unittest.cc',
@@ -950,7 +938,6 @@
         '<@(password_manager_unittest_sources)',
         '<@(precache_unittest_sources)',
         '<@(proxy_config_unittest_sources)',
-        '<@(prefs_unittest_sources)',
         '<@(query_parser_unittest_sources)',
         '<@(rappor_unittest_sources)',
         '<@(search_engines_unittest_sources)',
@@ -983,6 +970,7 @@
       ],
       'dependencies': [
         '../base/base.gyp:base',
+        '../base/base.gyp:base_prefs_test_support',
         '../base/base.gyp:test_support_base',
         '../google_apis/google_apis.gyp:google_apis_test_support',
         '../jingle/jingle.gyp:notifier_test_util',
@@ -1117,8 +1105,6 @@
         'components_strings.gyp:components_strings',
         'components_tests_pak',
         'mime_util/mime_util.gyp:mime_util',
-        'prefs/prefs.gyp:prefs',
-        'prefs/prefs.gyp:prefs_test_support',
         'url_formatter/url_formatter.gyp:url_formatter',
       ],
       'conditions': [