Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/browser/prefs/pref_service_syncable_builder.cc

 // Copyright (c) 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.
 
 #include "chrome/browser/prefs/pref_service_syncable_builder.h"
 
 #include "base/prefs/default_pref_store.h"
 #include "chrome/browser/policy/configuration_policy_pref_store.h"
 #include "chrome/browser/policy/policy_service.h"
 #include "chrome/browser/prefs/command_line_pref_store.h"
 #include "chrome/browser/prefs/pref_notifier_impl.h"
+#include "chrome/browser/prefs/pref_registry_simple.h"
 #include "chrome/browser/prefs/pref_service_syncable.h"
 #include "chrome/browser/prefs/pref_value_store.h"
 
 PrefServiceSyncableBuilder::PrefServiceSyncableBuilder() {
 }
 
 PrefServiceSyncableBuilder::~PrefServiceSyncableBuilder() {
 }
 
 #if defined(ENABLE_CONFIGURATION_POLICY)
@@ skipping 12 matching lines @@
 }
 #endif
 
 PrefServiceSyncableBuilder&
 PrefServiceSyncableBuilder::WithCommandLine(CommandLine* command_line) {
   WithCommandLinePrefs(new CommandLinePrefStore(command_line));
   return *this;
 }
 
 PrefServiceSyncable* PrefServiceSyncableBuilder::CreateSyncable() {
-  DefaultPrefStore* default_pref_store = new DefaultPrefStore();
+  // TODO(joi): Switch to accepting a PrefRegistrySyncable parameter.
+  scoped_refptr<PrefRegistry> pref_registry = new PrefRegistrySimple();
   PrefNotifierImpl* pref_notifier = new PrefNotifierImpl();
   PrefServiceSyncable* pref_service = new PrefServiceSyncable(
       pref_notifier,
       new PrefValueStore(
           managed_prefs_.get(),
           extension_prefs_.get(),
           command_line_prefs_.get(),
           user_prefs_.get(),
           recommended_prefs_.get(),
-          default_pref_store,
+          pref_registry->defaults(),
           pref_notifier),
       user_prefs_.get(),
-      default_pref_store,
+      pref_registry.get(),
       read_error_callback_,
       async_);
   ResetDefaultState();
   return pref_service;
 }