Move the bits of Prefs where production code has only trivially easy

chrome/chrome_browser.gypi

Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 00ebc4dc8007f3bff095296ad38569f87525154e..2c1822bf3002157904266937587fc38f666ac0f5 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -150,8 +150,6 @@
         'browser/api/infobars/one_click_signin_infobar_delegate.h',
         'browser/api/infobars/simple_alert_infobar_delegate.cc',
         'browser/api/infobars/simple_alert_infobar_delegate.h',
-        'browser/api/prefs/pref_change_registrar.cc',
-        'browser/api/prefs/pref_change_registrar.h',
         'browser/api/prefs/pref_member.cc',
         'browser/api/prefs/pref_member.h',
         'browser/api/sync/profile_sync_service_base.h',
@@ -1406,21 +1404,14 @@
         'browser/prefs/browser_prefs.h',
         'browser/prefs/command_line_pref_store.cc',
         'browser/prefs/command_line_pref_store.h',
-        'browser/prefs/default_pref_store.cc',
-        'browser/prefs/default_pref_store.h',
         'browser/prefs/incognito_mode_prefs.cc',
         'browser/prefs/incognito_mode_prefs.h',
-        'browser/prefs/overlay_user_pref_store.cc',
-        'browser/prefs/overlay_user_pref_store.h',
         'browser/prefs/pref_model_associator.cc',
         'browser/prefs/pref_model_associator.h',
-        'browser/prefs/pref_notifier.h',
         'browser/prefs/pref_notifier_impl.cc',
         'browser/prefs/pref_notifier_impl.h',
         'browser/prefs/pref_service.cc',
         'browser/prefs/pref_service.h',
-        'browser/prefs/pref_value_map.cc',
-        'browser/prefs/pref_value_map.h',
         'browser/prefs/pref_value_store.cc',
         'browser/prefs/pref_value_store.h',
         'browser/prefs/proxy_config_dictionary.cc',
@@ -1431,8 +1422,6 @@
         'browser/prefs/scoped_user_pref_update.h',
         'browser/prefs/session_startup_pref.cc',
         'browser/prefs/session_startup_pref.h',
-        'browser/prefs/value_map_pref_store.cc',
-        'browser/prefs/value_map_pref_store.h',
         'browser/prerender/prerender_condition.h',
         'browser/prerender/prerender_config.cc',
         'browser/prerender/prerender_config.h',
@@ -2135,6 +2124,21 @@
 
         # This file is generated by the autofill_regexes action.
         '<(SHARED_INTERMEDIATE_DIR)/autofill_regex_constants.cc',
+
+        # TODO(joi): Move to 'base_prefs' target in base/base.gyp once
+        # Prefs move is complete and dependencies have been broken.
+        '../base/prefs/default_pref_store.cc',
+        '../base/prefs/default_pref_store.h',
+        '../base/prefs/overlay_user_pref_store.cc',
+        '../base/prefs/overlay_user_pref_store.h',
+        '../base/prefs/pref_notifier.h',
+        '../base/prefs/pref_value_map.cc',
+        '../base/prefs/pref_value_map.h',
+        '../base/prefs/public/pref_change_registrar.cc',
+        '../base/prefs/public/pref_change_registrar.h',
+        '../base/prefs/public/pref_service_base.h',
+        '../base/prefs/value_map_pref_store.cc',
+        '../base/prefs/value_map_pref_store.h',
       ],
       'conditions': [
         ['enable_one_click_signin==0', {