Clean up PrefServiceBuilder

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 1628 matching lines @@
         '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_metrics_service.cc',
         'browser/prefs/pref_metrics_service.h',
         'browser/prefs/pref_service_syncable.cc',
         'browser/prefs/pref_service_syncable.h',
-        'browser/prefs/pref_service_syncable_builder.cc',
-        'browser/prefs/pref_service_syncable_builder.h',
+        'browser/prefs/pref_service_syncable_factory.cc',
+        'browser/prefs/pref_service_syncable_factory.h',
         'browser/prefs/pref_service_syncable_observer.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/session_startup_pref.cc',
         'browser/prefs/session_startup_pref.h',
         'browser/prefs/synced_pref_change_registrar.cc',
         'browser/prefs/synced_pref_change_registrar.h',
         'browser/prefs/synced_pref_observer.h',
@@ skipping 2109 matching lines @@
             'package_name': 'org/chromium/chrome/browser/ui/toolbar',
             'template_deps': ['browser/ui/toolbar/toolbar_model_security_level_list.h'],
           },
           'includes': [ '../build/android/java_cpp_template.gypi' ],
         },
       ],
      },
     ],
   ],
 }