Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/browser/browser_process_impl.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.
 
 // When each service is created, we set a flag indicating this. At this point,
 // the service initialization could fail or succeed. This allows us to remember
 // if we tried to create a service, and not try creating it over and over if
 // the creation failed.
 
 #ifndef CHROME_BROWSER_BROWSER_PROCESS_IMPL_H_
 #define CHROME_BROWSER_BROWSER_PROCESS_IMPL_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/debug/stack_trace.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/public/pref_change_registrar.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/timer.h"
 #include "chrome/browser/browser_process.h"
 
 class ChromeNetLog;
 class ChromeResourceDispatcherHostDelegate;
 class CommandLine;
 class RemoteDebuggingServer;
-class PrefServiceSimple;
+class PrefRegistrySimple;
 class PromoResourceService;
 
 #if defined(ENABLE_PLUGIN_INSTALLATION)
 class PluginsResourceService;
 #endif
 
 namespace base {
 class SequencedTaskRunner;
 }
 
@@ skipping 30 matching lines @@
   void StartTearDown();
   void PostDestroyThreads();
 
   // BrowserProcess implementation.
   virtual void ResourceDispatcherHostCreated() OVERRIDE;
   virtual void EndSession() OVERRIDE;
   virtual MetricsService* metrics_service() OVERRIDE;
   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 net::URLRequestContextGetter* system_request_context() OVERRIDE;
   virtual chrome_variations::VariationsService* variations_service() OVERRIDE;
 #if defined(OS_CHROMEOS)
   virtual chromeos::OomPriorityManager* oom_priority_manager() OVERRIDE;
 #endif  // defined(OS_CHROMEOS)
   virtual extensions::EventRouterForwarder*
         extension_event_router_forwarder() OVERRIDE;
   virtual NotificationUIManager* notification_ui_manager() OVERRIDE;
   virtual policy::BrowserPolicyConnector* browser_policy_connector() OVERRIDE;
   virtual policy::PolicyService* policy_service() OVERRIDE;
@@ skipping 32 matching lines @@
   virtual ChromeNetLog* net_log() OVERRIDE;
   virtual prerender::PrerenderTracker* prerender_tracker() OVERRIDE;
   virtual ComponentUpdateService* component_updater() OVERRIDE;
   virtual CRLSetFetcher* crl_set_fetcher() OVERRIDE;
   virtual BookmarkPromptController* bookmark_prompt_controller() OVERRIDE;
   virtual chrome::MediaFileSystemRegistry*
       media_file_system_registry() OVERRIDE;
   virtual void PlatformSpecificCommandLineProcessing(
       const CommandLine& command_line) OVERRIDE;
 
+  static void RegisterPrefs(PrefRegistrySimple* registry);
+
  private:
   void CreateMetricsService();
   void CreateWatchdogThread();
 #if defined(OS_CHROMEOS)
   void InitializeWebSocketProxyThread();
 #endif
   void CreateProfileManager();
   void CreateLocalState();
   void CreateViewedPageTracker();
   void CreateIconManager();
@@ skipping 27 matching lines @@
 
   // Must be destroyed after |local_state_|.
   // This is a stub when policy is not enabled. Otherwise, the PolicyService
   // is owned by the |browser_policy_connector_| and this is not used.
   scoped_ptr<policy::PolicyService> policy_service_;
 
   bool created_profile_manager_;
   scoped_ptr<ProfileManager> profile_manager_;
 
   bool created_local_state_;
-  scoped_ptr<PrefServiceSimple> local_state_;
+  scoped_ptr<PrefService> local_state_;
 
   bool created_icon_manager_;
   scoped_ptr<IconManager> icon_manager_;
 
   scoped_ptr<GLStringManager> gl_string_manager_;
 
   scoped_refptr<extensions::EventRouterForwarder>
       extension_event_router_forwarder_;
 
 #if !defined(OS_ANDROID)
@@ skipping 101 matching lines @@
 #endif
 
   // TODO(eroman): Remove this when done debugging 113031. This tracks
   // the callstack which released the final module reference count.
   base::debug::StackTrace release_last_reference_callstack_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserProcessImpl);
 };
 
 #endif  // CHROME_BROWSER_BROWSER_PROCESS_IMPL_H_