Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/browser/browser_process.h

Index: chrome/browser/browser_process.h
diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h
index 942c0b0fed52c18f036b621f9c2ee5a5fab226a9..40f70b50879d1e959cd9ad26e0291b37165ea494 100644
--- a/chrome/browser/browser_process.h
+++ b/chrome/browser/browser_process.h
@@ -29,7 +29,8 @@ class IntranetRedirectDetector;
 class IOThread;
 class MetricsService;
 class NotificationUIManager;
-class PrefServiceSimple;
+class PrefRegistrySimple;
+class PrefService;
 class Profile;
 class ProfileManager;
 class RenderWidgetSnapshotTaker;
@@ -103,7 +104,7 @@ class BrowserProcess {
   // Services: any of these getters may return NULL
   virtual MetricsService* metrics_service() = 0;
   virtual ProfileManager* profile_manager() = 0;
-  virtual PrefServiceSimple* local_state() = 0;
+  virtual PrefService* local_state() = 0;
   virtual net::URLRequestContextGetter* system_request_context() = 0;
   virtual chrome_variations::VariationsService* variations_service() = 0;