Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/browser/prefs/browser_prefs.h

Index: chrome/browser/prefs/browser_prefs.h
diff --git a/chrome/browser/prefs/browser_prefs.h b/chrome/browser/prefs/browser_prefs.h
index 296ab3bebc4d78613671cc54bd082fd5fdf6e955..5fb526224b73d9cf4ea21dcd1f4834f743c9ca90 100644
--- a/chrome/browser/prefs/browser_prefs.h
+++ b/chrome/browser/prefs/browser_prefs.h
@@ -5,19 +5,19 @@
 #ifndef CHROME_BROWSER_PREFS_BROWSER_PREFS_H_
 #define CHROME_BROWSER_PREFS_BROWSER_PREFS_H_
 
+class PrefRegistrySimple;
 class PrefService;
-class PrefServiceSimple;
 class PrefServiceSyncable;
 class Profile;
 
 namespace chrome {
 
 // Makes the PrefService objects aware of all the prefs.
-void RegisterLocalState(PrefServiceSimple* local_state);
+void RegisterLocalState(PrefRegistrySimple* registry, PrefService* local_state);
 void RegisterUserPrefs(PrefServiceSyncable* user_prefs);
 
 // Migrates prefs from |local_state| to |profile|'s pref store.
-void MigrateBrowserPrefs(Profile* profile, PrefServiceSimple* local_state);
+void MigrateBrowserPrefs(Profile* profile, PrefService* local_state);
 
 // Migrates prefs in |profile|'s pref store.
 void MigrateUserPrefs(Profile* profile);