Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/browser/prefs/chrome_pref_service_factory.h

Index: chrome/browser/prefs/chrome_pref_service_factory.h
diff --git a/chrome/browser/prefs/chrome_pref_service_factory.h b/chrome/browser/prefs/chrome_pref_service_factory.h
index 7ba5053f44fcfb5a067da7d8b256736412305228..87bec890ca66309d6eb42403a357d0b491bc0b8a 100644
--- a/chrome/browser/prefs/chrome_pref_service_factory.h
+++ b/chrome/browser/prefs/chrome_pref_service_factory.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_PREFS_CHROME_PREF_SERVICE_FACTORY_H_
 #define CHROME_BROWSER_PREFS_CHROME_PREF_SERVICE_FACTORY_H_
 
+#include "base/memory/ref_counted.h"
+
 namespace base {
 class FilePath;
 class SequencedTaskRunner;
@@ -14,7 +16,8 @@ namespace policy {
 class PolicyService;
 }
 
-class PrefServiceSimple;
+class PrefRegistry;
+class PrefService;
 class PrefServiceSyncable;
 class PrefStore;
 
@@ -28,24 +31,26 @@ namespace chrome_prefs {
 // preferences and may be NULL.
 // |policy_service| is used as the source for mandatory or recommended
 // policies.
+// |pref_registry| keeps the list of registered prefs and their default values.
 // If |async| is true, asynchronous version is used.
 // Notifies using PREF_INITIALIZATION_COMPLETED in the end. Details is set to
 // the created PrefService or NULL if creation has failed. Note, it is
 // guaranteed that in asynchronous version initialization happens after this
 // function returned.
 
-PrefServiceSimple* CreateLocalState(
+PrefService* CreateLocalState(
     const base::FilePath& pref_filename,
     base::SequencedTaskRunner* pref_io_task_runner,
     policy::PolicyService* policy_service,
-    PrefStore* extension_prefs,
+    const scoped_refptr<PrefStore>& extension_prefs,
+    const scoped_refptr<PrefRegistry>& pref_registry,
     bool async);
 
 PrefServiceSyncable* CreateProfilePrefs(
     const base::FilePath& pref_filename,
     base::SequencedTaskRunner* pref_io_task_runner,
     policy::PolicyService* policy_service,
-    PrefStore* extension_prefs,
+    const scoped_refptr<PrefStore>& extension_prefs,
     bool async);
 
 }  // namespace chrome_prefs