Not for check-in. Manually reviewable parts of https://codereview.chromium.org/11570009/

chrome/chrome_browser.gypi

 # Copyright 2012 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.
 
 {
   'targets': [
     {
       'target_name': 'browser',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ skipping 1445 matching lines @@
         'browser/predictors/resource_prefetch_predictor_tables.cc',
         'browser/predictors/resource_prefetch_predictor_tables.h',
         'browser/predictors/resource_prefetcher.cc',
         'browser/predictors/resource_prefetcher.h',
         'browser/predictors/resource_prefetcher_manager.cc',
         'browser/predictors/resource_prefetcher_manager.h',
         'browser/preferences_mac.cc',
         'browser/preferences_mac.h',
         'browser/prefs/browser_prefs.cc',
         'browser/prefs/browser_prefs.h',
-        'browser/prefs/chrome_pref_service_builder.cc',
-        'browser/prefs/chrome_pref_service_builder.h',
+        'browser/prefs/chrome_pref_service_factory.cc',
+        'browser/prefs/chrome_pref_service_factory.h',
         'browser/prefs/command_line_pref_store.cc',
         'browser/prefs/command_line_pref_store.h',
         'browser/prefs/incognito_mode_prefs.cc',
         'browser/prefs/incognito_mode_prefs.h',
         'browser/prefs/pref_model_associator.cc',
         'browser/prefs/pref_model_associator.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_service_builder.cc',
         'browser/prefs/pref_service_builder.h',
         'browser/prefs/pref_service_observer.h',
+        'browser/prefs/pref_service_simple.cc',
+        'browser/prefs/pref_service_simple.h',
+        'browser/prefs/pref_service_syncable.cc',
+        'browser/prefs/pref_service_syncable.h',
         'browser/prefs/pref_value_store.cc',
         'browser/prefs/pref_value_store.h',
         'browser/prefs/proxy_config_dictionary.cc',
         'browser/prefs/proxy_config_dictionary.h',
         'browser/prefs/proxy_prefs.cc',
         'browser/prefs/proxy_prefs.h',
         'browser/prefs/scoped_user_pref_update.cc',
         'browser/prefs/scoped_user_pref_update.h',
         'browser/prefs/session_startup_pref.cc',
         'browser/prefs/session_startup_pref.h',
@@ skipping 1622 matching lines @@
             'proto_in_dir': '../third_party/cros_system_api/dbus',
             'proto_out_dir': 'chrome/browser/media_transfer_protocol',
           },
           'includes': ['../build/protoc.gypi'],
         },
       ],
      },
     ],
   ],
 }