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..b8322f9bcf8c55dde0f17077e386ae27532b50f8 100644
--- a/chrome/browser/prefs/pref_service_builder.h
+++ b/chrome/browser/prefs/pref_service_builder.h
@@ -8,11 +8,13 @@
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"

[Mattias Nissler (ping if slow), 2013/01/31 14:50:45]

not needed I guess?

[Jói, 2013/01/31 16:23:37]

Done.

 #include "base/prefs/persistent_pref_store.h"
 #include "base/prefs/pref_store.h"
+#include "chrome/browser/prefs/pref_registry.h"
 
 class FilePath;
-class PrefServiceSimple;
+class PrefService;
 
 namespace base {
 class SequencedTaskRunner;
@@ -45,9 +47,9 @@ class PrefServiceBuilder {
 
   PrefServiceBuilder& WithAsync(bool async);
 
-  // Creates a PrefServiceSimple object initialized with the
-  // parameters from this builder.
-  virtual PrefServiceSimple* CreateSimple();
+  // Creates a PrefService object initialized with the parameters from
+  // this builder.
+  virtual PrefService* Create(PrefRegistry* registry);
 
  protected:
   virtual void ResetDefaultState();