Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/browser/net/pref_proxy_config_tracker_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.
 
 #ifndef CHROME_BROWSER_NET_PREF_PROXY_CONFIG_TRACKER_IMPL_H_
 #define CHROME_BROWSER_NET_PREF_PROXY_CONFIG_TRACKER_IMPL_H_
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/prefs/public/pref_change_registrar.h"
 #include "chrome/browser/prefs/proxy_config_dictionary.h"
 #include "net/proxy/proxy_config.h"
 #include "net/proxy/proxy_config_service.h"
 
 class PrefService;
-class PrefServiceSimple;
+class PrefRegistrarSimple;
 class PrefServiceSyncable;
 
 // A net::ProxyConfigService implementation that applies preference proxy
 // settings (pushed from PrefProxyConfigTrackerImpl) as overrides to the proxy
 // configuration determined by a baseline delegate ProxyConfigService on
 // non-ChromeOS platforms. ChromeOS has its own implementation of overrides in
 // chromeos::ProxyConfigServiceImpl.
 class ChromeProxyConfigService
     : public net::ProxyConfigService,
       public net::ProxyConfigService::Observer {
@@ skipping 84 matching lines @@
       ProxyPrefs::ConfigState* effective_config_state,
       net::ProxyConfig* effective_config);
 
   // Converts a ProxyConfigDictionary to net::ProxyConfig representation.
   // Returns true if the data from in the dictionary is valid, false otherwise.
   static bool PrefConfigToNetConfig(const ProxyConfigDictionary& proxy_dict,
                                     net::ProxyConfig* config);
 
   // Registers the proxy preferences. These are actually registered
   // the same way in local state and in user prefs.
-  static void RegisterPrefs(PrefServiceSimple* local_state);
+  static void RegisterPrefs(PrefRegistrarSimple* local_state);
   static void RegisterUserPrefs(PrefServiceSyncable* user_prefs);
 
  protected:
   // Get the proxy configuration currently defined by preferences.
   // Status is indicated in the return value.
   // Writes the configuration to |config| unless the return value is
   // CONFIG_UNSET, in which case |config| and |config_source| are not touched.
   ProxyPrefs::ConfigState GetProxyConfig(net::ProxyConfig* config);
 
   // Called when there's a change in prefs proxy config.
@@ skipping 21 matching lines @@
 
   PrefService* pref_service_;
   ChromeProxyConfigService* chrome_proxy_config_service_;  // Weak ptr.
   bool update_pending_;  // True if config has not been pushed to network stack.
   PrefChangeRegistrar proxy_prefs_;
 
   DISALLOW_COPY_AND_ASSIGN(PrefProxyConfigTrackerImpl);
 };
 
 #endif  // CHROME_BROWSER_NET_PREF_PROXY_CONFIG_TRACKER_IMPL_H_