Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/test/base/testing_browser_process.h

Index: chrome/test/base/testing_browser_process.h
diff --git a/chrome/test/base/testing_browser_process.h b/chrome/test/base/testing_browser_process.h
index 27c3601bd8332bd0e3986fd05fd00757c175adcd..1ce1d4955ce82800417ccb8e21da8ddad5bf5261 100644
--- a/chrome/test/base/testing_browser_process.h
+++ b/chrome/test/base/testing_browser_process.h
@@ -22,7 +22,7 @@ class CRLSetFetcher;
 class IOThread;
 class MHTMLGenerationManager;
 class NotificationUIManager;
-class PrefServiceSimple;
+class PrefService;
 class WatchDogThread;
 
 namespace content {
@@ -49,7 +49,7 @@ class TestingBrowserProcess : public BrowserProcess {
   virtual IOThread* io_thread() OVERRIDE;
   virtual WatchDogThread* watchdog_thread() OVERRIDE;
   virtual ProfileManager* profile_manager() OVERRIDE;
-  virtual PrefServiceSimple* local_state() OVERRIDE;
+  virtual PrefService* local_state() OVERRIDE;
   virtual chrome_variations::VariationsService* variations_service() OVERRIDE;
   virtual policy::BrowserPolicyConnector* browser_policy_connector() OVERRIDE;
   virtual policy::PolicyService* policy_service() OVERRIDE;
@@ -106,7 +106,7 @@ class TestingBrowserProcess : public BrowserProcess {
 
   // Set the local state for tests. Consumer is responsible for cleaning it up
   // afterwards (using ScopedTestingLocalState, for example).
-  void SetLocalState(PrefServiceSimple* local_state);
+  void SetLocalState(PrefService* local_state);
   void SetProfileManager(ProfileManager* profile_manager);
   void SetIOThread(IOThread* io_thread);
   void SetBrowserPolicyConnector(policy::BrowserPolicyConnector* connector);
@@ -139,7 +139,7 @@ class TestingBrowserProcess : public BrowserProcess {
 #endif  // !defined(OS_IOS)
 
   // The following objects are not owned by TestingBrowserProcess:
-  PrefServiceSimple* local_state_;
+  PrefService* local_state_;
   IOThread* io_thread_;
   net::URLRequestContextGetter* system_request_context_;