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(PrefService* pref_service, PrefRegistrySimple* registry) {
     ASSERT_TRUE(pref_service);
-    PrefProxyConfigTrackerImpl::RegisterPrefs(pref_service);
+    PrefProxyConfigTrackerImpl::RegisterPrefs(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 18 matching lines @@
   scoped_ptr<PrefProxyConfigTrackerImpl> proxy_config_tracker_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread io_thread_;
 };
 
 class PrefProxyConfigTrackerImplTest
     : public PrefProxyConfigTrackerImplTestBase<testing::Test> {
  protected:
   virtual void SetUp() {
     pref_service_.reset(new TestingPrefServiceSimple());
-    Init(pref_service_.get());
+    Init(pref_service_.get(), pref_service_->registry());
   }
 
   scoped_ptr<TestingPrefServiceSimple> pref_service_;
 };
 
 TEST_F(PrefProxyConfigTrackerImplTest, BaseConfiguration) {
   net::ProxyConfig actual_config;
   EXPECT_EQ(net::ProxyConfigService::CONFIG_VALID,
             proxy_config_service_->GetLatestProxyConfig(&actual_config));
   EXPECT_EQ(GURL(kFixedPacUrl), actual_config.pac_url());
@@ skipping 201 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());
-    Init(pref_service_.get());
+            &command_line_).Create(new PrefRegistrySimple));

[Mattias Nissler (ping if slow), 2013/01/31 16:30:54]

In this case, I'd rather create a PrefRegistrySimple up front, move the call to
PrefProxyConfigTrackerImpl::RegisterPrefs() out of Init() and pass just the
PrefService* to Init(). Note that the other call site is simpler, you can just
call RegisterPrefs on pref_service_->registry() there.

[Jói, 2013/01/31 17:29:32]

Done.

+    Init(pref_service_.get(),
+         static_cast<PrefRegistrySimple*>(
+             pref_service_->DeprecatedGetPrefRegistry()));
   }
 
  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