Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/browser/prefs/pref_service_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_builder.h"
 
 #include "base/bind.h"
 #include "base/prefs/default_pref_store.h"
 #include "base/prefs/json_pref_store.h"
 #include "chrome/browser/prefs/pref_notifier_impl.h"
+#include "chrome/browser/prefs/pref_registrar_simple.h"
 #include "chrome/browser/prefs/pref_service.h"
-#include "chrome/browser/prefs/pref_service_simple.h"
+
 #include "chrome/browser/prefs/pref_value_store.h"
 
 namespace {
 
 // Do-nothing default implementation.
 void DoNothingHandleReadError(PersistentPrefStore::PrefReadError error) {
 }
 
 }  // namespace
 
@@ skipping 42 matching lines @@
     base::SequencedTaskRunner* task_runner) {
   user_prefs_ = new JsonPrefStore(prefs_file, task_runner);
   return *this;
 }
 
 PrefServiceBuilder& PrefServiceBuilder::WithAsync(bool async) {
   async_ = async;
   return *this;
 }
 
-PrefServiceSimple* PrefServiceBuilder::CreateSimple() {
+PrefService* PrefServiceBuilder::CreateSimple() {
   DefaultPrefStore* default_pref_store = new DefaultPrefStore();
   PrefNotifierImpl* pref_notifier = new PrefNotifierImpl();
-  PrefServiceSimple* pref_service = new PrefServiceSimple(
+  PrefService* pref_service = new PrefService(
       pref_notifier,
       new PrefValueStore(
           managed_prefs_.get(),
           extension_prefs_.get(),
           command_line_prefs_.get(),
           user_prefs_.get(),
           recommended_prefs_.get(),
           default_pref_store,
           pref_notifier),
       user_prefs_.get(),
       default_pref_store,
       read_error_callback_,
       async_);
   ResetDefaultState();
   return pref_service;
 }
 
 void PrefServiceBuilder::ResetDefaultState() {
   managed_prefs_ = NULL;
   extension_prefs_ = NULL;
   command_line_prefs_ = NULL;
   user_prefs_ = NULL;
   recommended_prefs_ = NULL;
   read_error_callback_ = base::Bind(&DoNothingHandleReadError);
   async_ = false;
 }