Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/browser/chromeos/proxy_config_service_impl.cc

 // 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.
 
 #include "chrome/browser/chromeos/proxy_config_service_impl.h"
 
 #include <ostream>
 
 #include "base/bind.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/cros_settings_names.h"
 #include "chrome/browser/policy/proto/chrome_device_policy.pb.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/browser/prefs/proxy_prefs.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/network/onc/onc_constants.h"
 #include "content/public/browser/notification_service.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 545 matching lines @@
   JSONStringValueSerializer serializer(network->proxy_config());
   scoped_ptr<Value> value(serializer.Deserialize(NULL, NULL));
   if (!value.get() || value->GetType() != Value::TYPE_DICTIONARY)
     return false;
   ProxyConfigDictionary proxy_dict(static_cast<DictionaryValue*>(value.get()));
   return PrefProxyConfigTrackerImpl::PrefConfigToNetConfig(proxy_dict,
                                                            proxy_config);
 }
 
 // static
-void ProxyConfigServiceImpl::RegisterPrefs(PrefServiceSimple* pref_service) {
+void ProxyConfigServiceImpl::RegisterPrefs(PrefRegistrySimple* registry) {
   // Use shared proxies default to off.  GetUseSharedProxies will return the
   // correct value based on pre-login and login.
-  pref_service->RegisterBooleanPref(prefs::kUseSharedProxies, true);
+  registry->RegisterBooleanPref(prefs::kUseSharedProxies, true);
 }
 
 // static
 void ProxyConfigServiceImpl::RegisterUserPrefs(
     PrefServiceSyncable* pref_service) {
   pref_service->RegisterBooleanPref(prefs::kUseSharedProxies,
                                     true,
                                     PrefServiceSyncable::UNSYNCABLE_PREF);
 }
 
@@ skipping 249 matching lines @@
     device_config_.clear();
     return;
   }
   if (!active_network_.empty()) {
     VLOG(1) << "Try migrating device config to " << active_network_;
     SetProxyConfigForNetwork(active_network_, device_config_, true);
   }
 }
 
 }  // namespace chromeos