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 84e5a637400ef75d6be8aaccf3939d91d9212a69..6a6fc18844fdbb0daadef0de4fd143063d2f4cfb 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/scoped_ptr.h"
+
 namespace base {
 class SequencedTaskRunner;
 }
@@ -14,7 +16,8 @@ class PolicyService;
 }
 
 class FilePath;
-class PrefServiceSimple;
+class PrefRegistry;
+class PrefService;
 class PrefServiceSyncable;
 class PrefStore;
 
@@ -28,17 +31,21 @@ namespace chrome_prefs {
 // preferences and may be NULL.
 // |policy_service| is used as the source for mandatory or recommended
 // policies.
+// |pref_registry| is the registry object to retrieve registration
+// information from; PrefService takes ownership (not used for
+// CreateProfilePrefs yet).

[Mattias Nissler (ping if slow), 2013/01/25 14:57:11]

Once we use it for profile prefs, there's a slight complication: The incognito
PrefService we derive from the regular PrefService also needs a registry, but we
can't have both PrefService instances own the pointer. At that point we either
have to copy, or make PrefRegistry RefCounted (which would be in sync with the
approach we took for PrefStore, which is in the same situation).

[Jói, 2013/01/29 16:10:02]

Fixed this by having a separate PrefRegistry that owns the same
DefaultPrefStore. Currently accomplished by way of PrefServiceSyncable being a
friend of PrefRegistry but once that goes away I'll put something nicer (factory
function or some such).

 // 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 FilePath& pref_filename,
     base::SequencedTaskRunner* pref_io_task_runner,
     policy::PolicyService* policy_service,
     PrefStore* extension_prefs,
+    scoped_ptr<PrefRegistry> pref_registry,
     bool async);
 
 PrefServiceSyncable* CreateProfilePrefs(