Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/browser/prefs/pref_service_builder.h

Index: chrome/browser/prefs/pref_service_builder.h
diff --git a/chrome/browser/prefs/pref_service_builder.h b/chrome/browser/prefs/pref_service_builder.h
index adcbdf06070b36a3f7c49863a2b6af9eef521f0c..29f431474a273b864ca03fccb65fe89393011a01 100644
--- a/chrome/browser/prefs/pref_service_builder.h
+++ b/chrome/browser/prefs/pref_service_builder.h
@@ -12,7 +12,7 @@
 #include "base/prefs/pref_store.h"
 
 class FilePath;
-class PrefServiceSimple;
+class PrefService;
 
 namespace base {
 class SequencedTaskRunner;
@@ -45,9 +45,9 @@ class PrefServiceBuilder {
 
   PrefServiceBuilder& WithAsync(bool async);
 
-  // Creates a PrefServiceSimple object initialized with the
+  // Creates a PrefService object initialized with the
   // parameters from this builder.
-  virtual PrefServiceSimple* CreateSimple();
+  virtual PrefService* CreateSimple();
 
  protected:
   virtual void ResetDefaultState();