Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/browser/io_thread.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.
 
 #ifndef CHROME_BROWSER_IO_THREAD_H_
 #define CHROME_BROWSER_IO_THREAD_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/prefs/public/pref_member.h"
 #include "chrome/browser/net/ssl_config_service_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/browser_thread_delegate.h"
 #include "net/base/network_change_notifier.h"
 #include "net/http/http_network_session.h"
 #include "net/socket/next_proto.h"
 
 class ChromeNetLog;
 class CommandLine;
 class PrefProxyConfigTrackerImpl;
 class PrefService;
-class PrefServiceSimple;
+class PrefRegistrarSimple;
 class SystemURLRequestContextGetter;
 
 namespace chrome_browser_net {
 class DnsProbeService;
 class HttpPipeliningCompatibilityClient;
 class LoadTimeStats;
 }
 
 namespace extensions {
 class EventRouterForwarder;
@@ skipping 123 matching lines @@
     Optional<bool> enable_spdy_ping_based_connection_checking;
     Optional<net::NextProto> spdy_default_protocol;
     Optional<uint16> origin_port_to_force_quic_on;
     // NetErrorTabHelper uses |dns_probe_service| to send DNS probes when a
     // main frame load fails with a DNS error in order to provide more useful
     // information to the renderer so it can show a more specific error page.
     scoped_ptr<chrome_browser_net::DnsProbeService> dns_probe_service;
   };
 
   // |net_log| must either outlive the IOThread or be NULL.
-  IOThread(PrefServiceSimple* local_state,
+  IOThread(PrefService* local_state,
            policy::PolicyService* policy_service,
            ChromeNetLog* net_log,
            extensions::EventRouterForwarder* extension_event_router_forwarder);
 
   virtual ~IOThread();
 
   // Can only be called on the IO thread.
   Globals* globals();
 
   ChromeNetLog* net_log();
@@ skipping 44 matching lines @@
   // Global state must be initialized on the IO thread, then this
   // method must be invoked on the UI thread.
   void InitSystemRequestContext();
 
   // Lazy initialization of system request context for
   // SystemURLRequestContextGetter. To be called on IO thread only
   // after global state has been initialized on the IO thread, and
   // SystemRequestContext state has been initialized on the UI thread.
   void InitSystemRequestContextOnIOThread();
 
-  static void RegisterPrefs(PrefServiceSimple* local_state);
+  static void RegisterPrefs(PrefRegistrarSimple* local_state);
 
   net::HttpAuthHandlerFactory* CreateDefaultAuthHandlerFactory(
       net::HostResolver* resolver);
 
   // Returns an SSLConfigService instance.
   net::SSLConfigService* GetSSLConfigService();
 
   void ChangedToOnTheRecordOnIOThread();
 
   void UpdateDnsClientEnabled();
@@ skipping 50 matching lines @@
 
   // True if SPDY is disabled by policy.
   bool is_spdy_disabled_by_policy_;
 
   base::WeakPtrFactory<IOThread> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(IOThread);
 };
 
 #endif  // CHROME_BROWSER_IO_THREAD_H_