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

chrome/chrome_common.gypi

Index: chrome/chrome_common.gypi
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index bead55fa98fe81cb76101d48b899562d8455f26d..4c4f32ad050a0293fceb83e5e2ff5dbe768152be 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -220,8 +220,6 @@
         'common/important_file_writer.h',
         'common/instant_types.cc',
         'common/instant_types.h',
-        'common/json_pref_store.cc',
-        'common/json_pref_store.h',
         'common/json_schema_constants.cc',
         'common/json_schema_constants.h',
         'common/json_schema_validator.cc',
@@ -270,9 +268,6 @@
         'common/password_generation_util.h',
         'common/pepper_flash.cc',
         'common/pepper_flash.h',
-        'common/persistent_pref_store.h',
-        'common/pref_store.cc',
-        'common/pref_store.h',
         'common/print_messages.cc',
         'common/print_messages.h',
         'common/profiling.cc',
@@ -320,6 +315,14 @@
         'common/zip_internal.h',
         'common/zip_reader.cc',
         'common/zip_reader.h',
+
+        # TODO(joi): Move to 'base_prefs' target in base/base.gyp once
+        # Prefs move is complete and dependencies have been broken.
+        '../base/prefs/json_pref_store.cc',
+        '../base/prefs/json_pref_store.h',
+        '../base/prefs/persistent_pref_store.h',
+        '../base/prefs/pref_store.cc',
+        '../base/prefs/pref_store.h',
       ],
       'conditions': [
         ['OS != "ios"', {