Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/browser/browser_process.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This interface is for managing the global services of the application. Each
 // service is lazily created when requested the first time. The service getters
 // will return NULL if the service is not available, so callers must check for
 // this condition.
 
 #ifndef CHROME_BROWSER_BROWSER_PROCESS_H_
@@ skipping 11 matching lines @@
 class CRLSetFetcher;
 class ComponentUpdateService;
 class DownloadRequestLimiter;
 class DownloadStatusUpdater;
 class GLStringManager;
 class IconManager;
 class IntranetRedirectDetector;
 class IOThread;
 class MetricsService;
 class NotificationUIManager;
-class PrefServiceSimple;
+class PrefRegistrySimple;
+class PrefService;
 class Profile;
 class ProfileManager;
 class RenderWidgetSnapshotTaker;
 class SafeBrowsingService;
 class StatusTray;
 class WatchDogThread;
 
 namespace chrome {
 class MediaFileSystemRegistry;
 }
@@ skipping 47 matching lines @@
 
   // Invoked when the user is logging out/shutting down. When logging off we may
   // not have enough time to do a normal shutdown. This method is invoked prior
   // to normal shutdown and saves any state that must be saved before we are
   // continue shutdown.
   virtual void EndSession() = 0;
 
   // 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;
 
 #if defined(OS_CHROMEOS)
   // Returns the out-of-memory priority manager.
   virtual chromeos::OomPriorityManager* oom_priority_manager() = 0;
 #endif  // defined(OS_CHROMEOS)
 
   virtual extensions::EventRouterForwarder*
       extension_event_router_forwarder() = 0;
@@ skipping 97 matching lines @@
   virtual void PlatformSpecificCommandLineProcessing(
       const CommandLine& command_line) = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(BrowserProcess);
 };
 
 extern BrowserProcess* g_browser_process;
 
 #endif  // CHROME_BROWSER_BROWSER_PROCESS_H_