Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/browser/prefs/pref_service_builder.cc

Index: chrome/browser/prefs/pref_service_builder.cc
diff --git a/chrome/browser/prefs/pref_service_builder.cc b/chrome/browser/prefs/pref_service_builder.cc
index c1880b1db657d6515ec89f65c864ce8ff96287c6..a4464ed415834a8dff6e1629f237b52f030b8780 100644
--- a/chrome/browser/prefs/pref_service_builder.cc
+++ b/chrome/browser/prefs/pref_service_builder.cc
@@ -8,8 +8,9 @@
 #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 {
@@ -72,10 +73,10 @@ PrefServiceBuilder& PrefServiceBuilder::WithAsync(bool 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(),