Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/browser/net/pref_proxy_config_tracker_impl.cc

 // Copyright (c) 2011 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.
 
 #include "chrome/browser/net/pref_proxy_config_tracker_impl.h"
 
 #include "base/bind.h"
 #include "base/values.h"
+#include "chrome/browser/prefs/pref_registry_simple.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/proxy_config_dictionary.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 
 using content::BrowserThread;
 
@@ skipping 169 matching lines @@
       *effective_config = net::ProxyConfig::CreateDirect();
     return net::ProxyConfigService::CONFIG_VALID;
   }
 
   *effective_config_state = ProxyPrefs::CONFIG_SYSTEM;
   *effective_config = system_config;
   return system_availability;
 }
 
 // static
-void PrefProxyConfigTrackerImpl::RegisterPrefs(
-    PrefServiceSimple* local_state) {
+void PrefProxyConfigTrackerImpl::RegisterPrefs(PrefRegistrySimple* registry) {
   DictionaryValue* default_settings = ProxyConfigDictionary::CreateSystem();
-  local_state->RegisterDictionaryPref(prefs::kProxy, default_settings);
+  registry->RegisterDictionaryPref(prefs::kProxy, default_settings);
 }
 
 // static
 void PrefProxyConfigTrackerImpl::RegisterUserPrefs(
     PrefServiceSyncable* pref_service) {
   DictionaryValue* default_settings = ProxyConfigDictionary::CreateSystem();
   pref_service->RegisterDictionaryPref(prefs::kProxy,
                                        default_settings,
                                        PrefServiceSyncable::UNSYNCABLE_PREF);
 }
@@ skipping 124 matching lines @@
         config_state = ProxyPrefs::CONFIG_EXTENSION;
       else
         config_state = ProxyPrefs::CONFIG_OTHER_PRECEDE;
     } else  {
       config_state = ProxyPrefs::CONFIG_FALLBACK;
     }
   }
 
   return config_state;
 }