Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc

Index: chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc
diff --git a/chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc b/chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc
index cf2b6c8f104404c8a2018cf28bc7d01fb91d6b4f..6003aec755a38be37676d105f9797023e0263603 100644
--- a/chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc
+++ b/chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc
@@ -8,6 +8,7 @@
 #include "base/file_path.h"
 #include "base/message_loop.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
+#include "chrome/browser/prefs/pref_registry_simple.h"
 #include "chrome/browser/prefs/pref_service_mock_builder.h"
 #include "chrome/browser/prefs/proxy_config_dictionary.h"
 #include "chrome/common/chrome_switches.h"
@@ -77,9 +78,11 @@ class PrefProxyConfigTrackerImplTestBase : public TESTBASE {
       : ui_thread_(BrowserThread::UI, &loop_),
         io_thread_(BrowserThread::IO, &loop_) {}
 
-  virtual void Init(PrefServiceSimple* pref_service) {
+  virtual void Init(PrefService* pref_service) {

[Mattias Nissler (ping if slow), 2013/01/31 13:06:25]

Just change the parameter type to TestingPrefServiceSimple so you don't have to
do the cast.

[Jói, 2013/01/31 13:43:42]

Done.

     ASSERT_TRUE(pref_service);
-    PrefProxyConfigTrackerImpl::RegisterPrefs(pref_service);
+    PrefRegistrySimple* registry = static_cast<PrefRegistrySimple*>(
+        pref_service->DeprecatedGetPrefRegistry());
+    PrefProxyConfigTrackerImpl::RegisterPrefs(registry);
     fixed_config_.set_pac_url(GURL(kFixedPacUrl));
     delegate_service_ =
         new TestProxyConfigService(fixed_config_,
@@ -340,13 +343,13 @@ class PrefProxyConfigTrackerImplCommandLineTest
     }
     pref_service_.reset(
         PrefServiceMockBuilder().WithCommandLine(
-            &command_line_).CreateSimple());
+            &command_line_).Create(new PrefRegistrySimple));
     Init(pref_service_.get());
   }
 
  private:
   CommandLine command_line_;
-  scoped_ptr<PrefServiceSimple> pref_service_;
+  scoped_ptr<PrefService> pref_service_;
 };
 
 TEST_P(PrefProxyConfigTrackerImplCommandLineTest, CommandLine) {