Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/browser/net/pref_proxy_config_tracker_impl_unittest.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/command_line.h"
 #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"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "content/public/test/test_browser_thread.h"
 #include "net/proxy/proxy_config_service_common_unittest.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 49 matching lines @@
                     net::ProxyConfigService::ConfigAvailability));
 };
 
 template<typename TESTBASE>
 class PrefProxyConfigTrackerImplTestBase : public TESTBASE {
  protected:
   PrefProxyConfigTrackerImplTestBase()
       : ui_thread_(BrowserThread::UI, &loop_),
         io_thread_(BrowserThread::IO, &loop_) {}
 
-  virtual void Init(PrefServiceSimple* pref_service) {
+  virtual void Init(TestingPrefServiceSimple* pref_service) {

[Jói, 2013/01/31 16:23:37]

Actually, this wasn't so simple because
PrefProxyConfigTrackerImplCommandLineTest needs to create a real PrefService to
initialize this class. Switched to taking PrefService* and PrefRegistrySimple*
as parameters here, and casting only where needed.

     ASSERT_TRUE(pref_service);
-    PrefProxyConfigTrackerImpl::RegisterPrefs(pref_service);
+    PrefProxyConfigTrackerImpl::RegisterPrefs(pref_service->registry());
     fixed_config_.set_pac_url(GURL(kFixedPacUrl));
     delegate_service_ =
         new TestProxyConfigService(fixed_config_,
                                    net::ProxyConfigService::CONFIG_VALID);
     proxy_config_service_.reset(
         new ChromeProxyConfigService(delegate_service_));
     proxy_config_tracker_.reset(new PrefProxyConfigTrackerImpl(pref_service));
     proxy_config_tracker_->SetChromeProxyConfigService(
         proxy_config_service_.get());
     // SetChromeProxyConfigService triggers update of initial prefs proxy
@@ skipping 240 matching lines @@
     for (size_t i = 0; i < arraysize(GetParam().switches); i++) {
       const char* name = GetParam().switches[i].name;
       const char* value = GetParam().switches[i].value;
       if (name && value)
         command_line_.AppendSwitchASCII(name, value);
       else if (name)
         command_line_.AppendSwitch(name);
     }
     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) {
   net::ProxyConfig config;
   EXPECT_EQ(net::ProxyConfigService::CONFIG_VALID,
             proxy_config_service_->GetLatestProxyConfig(&config));
 
   if (GetParam().is_null) {
     EXPECT_EQ(GURL(kFixedPacUrl), config.pac_url());
   } else {
@@ skipping 113 matching lines @@
     net::ProxyRulesExpectation::Empty(),
   },
 };
 
 INSTANTIATE_TEST_CASE_P(
     PrefProxyConfigTrackerImplCommandLineTestInstance,
     PrefProxyConfigTrackerImplCommandLineTest,
     testing::ValuesIn(kCommandLineTestParams));
 
 }  // namespace