Componentize proxy code from chrome/browser/net

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 "components/proxy_config/pref_proxy_config_tracker_impl.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/testing_pref_service.h"
 #include "base/test/histogram_tester.h"
 #include "chrome/browser/prefs/pref_service_mock_factory.h"
@@ skipping 66 matching lines @@
       : ui_thread_(BrowserThread::UI, &loop_),
         io_thread_(BrowserThread::IO, &loop_) {}
 
   virtual void Init(PrefService* pref_service, PrefRegistrySimple* registry) {
     ASSERT_TRUE(pref_service);
     PrefProxyConfigTrackerImpl::RegisterPrefs(registry);
     fixed_config_.set_pac_url(GURL(kFixedPacUrl));
     delegate_service_ =
         new TestProxyConfigService(fixed_config_,
                                    net::ProxyConfigService::CONFIG_VALID);
-    proxy_config_tracker_.reset(new PrefProxyConfigTrackerImpl(pref_service));
+    proxy_config_tracker_.reset(new PrefProxyConfigTrackerImpl(
+        pref_service,
+        BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)));
     proxy_config_service_ =
         proxy_config_tracker_->CreateTrackingProxyConfigService(
             scoped_ptr<net::ProxyConfigService>(delegate_service_));
     // SetChromeProxyConfigService triggers update of initial prefs proxy
     // config by tracker to chrome proxy config service, so flush all pending
     // tasks so that tests start fresh.
     loop_.RunUntilIdle();
   }
 
   virtual void TearDown() {
     proxy_config_tracker_->DetachFromPrefService();
     loop_.RunUntilIdle();
     proxy_config_tracker_.reset();
     proxy_config_service_.reset();
   }
 
   base::MessageLoop loop_;
   TestProxyConfigService* delegate_service_; // weak
   scoped_ptr<net::ProxyConfigService> proxy_config_service_;
   net::ProxyConfig fixed_config_;
 
  private:
   scoped_ptr<PrefProxyConfigTrackerImpl> proxy_config_tracker_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread io_thread_;

[droger, 2015/08/17 13:51:35]

Can we remove these two threads and use ThreadTaskRunnerHandle::Get() instead
everywhere in this test?

[Abhishek, 2015/08/19 08:30:49]

Done.

 };
 
 class PrefProxyConfigTrackerImplTest
     : public PrefProxyConfigTrackerImplTestBase<testing::Test> {
  protected:
   void SetUp() override {
     pref_service_.reset(new TestingPrefServiceSimple());
     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());
 }
 
 TEST_F(PrefProxyConfigTrackerImplTest, DynamicPrefOverrides) {
-  pref_service_->SetManagedPref(prefs::kProxy,
+  pref_service_->SetManagedPref(ProxyPrefs::kProxy,
                                 ProxyConfigDictionary::CreateFixedServers(
                                     "http://example.com:3128", std::string()));
   loop_.RunUntilIdle();
 
   net::ProxyConfig actual_config;
   EXPECT_EQ(net::ProxyConfigService::CONFIG_VALID,
             proxy_config_service_->GetLatestProxyConfig(&actual_config));
   EXPECT_FALSE(actual_config.auto_detect());
   EXPECT_EQ(net::ProxyConfig::ProxyRules::TYPE_SINGLE_PROXY,
             actual_config.proxy_rules().type);
   EXPECT_EQ(actual_config.proxy_rules().single_proxies.Get(),
             net::ProxyServer::FromURI("http://example.com:3128",
                                       net::ProxyServer::SCHEME_HTTP));
 
-  pref_service_->SetManagedPref(prefs::kProxy,
+  pref_service_->SetManagedPref(ProxyPrefs::kProxy,
                                 ProxyConfigDictionary::CreateAutoDetect());
   loop_.RunUntilIdle();
 
   EXPECT_EQ(net::ProxyConfigService::CONFIG_VALID,
             proxy_config_service_->GetLatestProxyConfig(&actual_config));
   EXPECT_TRUE(actual_config.auto_detect());
 }
 
 // Compares proxy configurations, but allows different identifiers.
 MATCHER_P(ProxyConfigMatches, config, "") {
@@ skipping 17 matching lines @@
   loop_.RunUntilIdle();
   Mock::VerifyAndClearExpectations(&observer);
 
   // Override configuration, this should trigger a notification.
   net::ProxyConfig pref_config;
   pref_config.set_pac_url(GURL(kFixedPacUrl));
 
   EXPECT_CALL(observer, OnProxyConfigChanged(ProxyConfigMatches(pref_config),
                                              CONFIG_VALID)).Times(1);
   pref_service_->SetManagedPref(
-      prefs::kProxy,
+      ProxyPrefs::kProxy,
       ProxyConfigDictionary::CreatePacScript(kFixedPacUrl, false));
   loop_.RunUntilIdle();
   Mock::VerifyAndClearExpectations(&observer);
 
   // Since there are pref overrides, delegate changes should be ignored.
   net::ProxyConfig config3;
   config3.proxy_rules().ParseFromString("http=config3:80");
   EXPECT_CALL(observer, OnProxyConfigChanged(_, _)).Times(0);
   fixed_config_.set_auto_detect(true);
   delegate_service_->SetProxyConfig(config3, CONFIG_VALID);
   loop_.RunUntilIdle();
   Mock::VerifyAndClearExpectations(&observer);
 
   // Clear the override should switch back to the fixed configuration.
   EXPECT_CALL(observer, OnProxyConfigChanged(ProxyConfigMatches(config3),
                                              CONFIG_VALID)).Times(1);
-  pref_service_->RemoveManagedPref(prefs::kProxy);
+  pref_service_->RemoveManagedPref(ProxyPrefs::kProxy);
   loop_.RunUntilIdle();
   Mock::VerifyAndClearExpectations(&observer);
 
   // Delegate service notifications should show up again.
   net::ProxyConfig config4;
   config4.proxy_rules().ParseFromString("socks:config4");
   EXPECT_CALL(observer, OnProxyConfigChanged(ProxyConfigMatches(config4),
                                              CONFIG_VALID)).Times(1);
   delegate_service_->SetProxyConfig(config4, CONFIG_VALID);
   loop_.RunUntilIdle();
@@ skipping 13 matching lines @@
 
   // Prepare test data.
   net::ProxyConfig recommended_config = net::ProxyConfig::CreateAutoDetect();
   net::ProxyConfig user_config =
       net::ProxyConfig::CreateFromCustomPacURL(GURL(kFixedPacUrl));
 
   // Set a recommended pref.
   EXPECT_CALL(observer,
               OnProxyConfigChanged(ProxyConfigMatches(recommended_config),
                                    CONFIG_VALID)).Times(1);
-  pref_service_->SetRecommendedPref(
-      prefs::kProxy,
-      ProxyConfigDictionary::CreateAutoDetect());
+  pref_service_->SetRecommendedPref(ProxyPrefs::kProxy,
+                                    ProxyConfigDictionary::CreateAutoDetect());
   loop_.RunUntilIdle();
   Mock::VerifyAndClearExpectations(&observer);
   EXPECT_EQ(CONFIG_VALID,
             proxy_config_service_->GetLatestProxyConfig(&actual_config));
   EXPECT_TRUE(actual_config.Equals(recommended_config));
 
   // Override in user prefs.
   EXPECT_CALL(observer,
               OnProxyConfigChanged(ProxyConfigMatches(user_config),
                                    CONFIG_VALID)).Times(1);
   pref_service_->SetManagedPref(
-      prefs::kProxy,
+      ProxyPrefs::kProxy,
       ProxyConfigDictionary::CreatePacScript(kFixedPacUrl, false));
   loop_.RunUntilIdle();
   Mock::VerifyAndClearExpectations(&observer);
   EXPECT_EQ(CONFIG_VALID,
             proxy_config_service_->GetLatestProxyConfig(&actual_config));
   EXPECT_TRUE(actual_config.Equals(user_config));
 
   // Go back to recommended pref.
   EXPECT_CALL(observer,
               OnProxyConfigChanged(ProxyConfigMatches(recommended_config),
                                    CONFIG_VALID)).Times(1);
-  pref_service_->RemoveManagedPref(prefs::kProxy);
+  pref_service_->RemoveManagedPref(ProxyPrefs::kProxy);
   loop_.RunUntilIdle();
   Mock::VerifyAndClearExpectations(&observer);
   EXPECT_EQ(CONFIG_VALID,
             proxy_config_service_->GetLatestProxyConfig(&actual_config));
   EXPECT_TRUE(actual_config.Equals(recommended_config));
 
   proxy_config_service_->RemoveObserver(&observer);
 }
 
 TEST_F(PrefProxyConfigTrackerImplTest, ExplicitSystemSettings) {
-  pref_service_->SetRecommendedPref(
-      prefs::kProxy,
-      ProxyConfigDictionary::CreateAutoDetect());
-  pref_service_->SetUserPref(
-      prefs::kProxy,
-      ProxyConfigDictionary::CreateSystem());
+  pref_service_->SetRecommendedPref(ProxyPrefs::kProxy,
+                                    ProxyConfigDictionary::CreateAutoDetect());
+  pref_service_->SetUserPref(ProxyPrefs::kProxy,
+                             ProxyConfigDictionary::CreateSystem());
   loop_.RunUntilIdle();
 
   // Test if we actually use the system setting, which is |kFixedPacUrl|.
   net::ProxyConfig actual_config;
   EXPECT_EQ(net::ProxyConfigService::CONFIG_VALID,
             proxy_config_service_->GetLatestProxyConfig(&actual_config));
   EXPECT_EQ(GURL(kFixedPacUrl), actual_config.pac_url());
 }
 
 void CheckResolvedProxyMatches(net::ProxyConfig* config,
@@ skipping 60 matching lines @@
       {"direct://",
        "direct://",
        "direct://",
        "direct://",
        0},
   };
 
   // Test setting the proxy from a user pref.
   for (const auto& test : test_cases) {
     base::HistogramTester histogram_tester;
-    pref_service_->SetUserPref(prefs::kProxy,
+    pref_service_->SetUserPref(ProxyPrefs::kProxy,
                                ProxyConfigDictionary::CreateFixedServers(
                                    test.initial_proxy_rules, std::string()));
     loop_.RunUntilIdle();
 
     net::ProxyConfig config;
     EXPECT_EQ(net::ProxyConfigService::CONFIG_VALID,
               proxy_config_service_->GetLatestProxyConfig(&config));
     histogram_tester.ExpectUniqueSample(
         "Net.PrefProxyConfig.GooglezipProxyRemovalCount",
         test.expected_num_removed_proxies, 1);
@@ skipping 193 matching lines @@
     net::ProxyRulesExpectation::Empty(),
   },
 };
 
 INSTANTIATE_TEST_CASE_P(
     PrefProxyConfigTrackerImplCommandLineTestInstance,
     PrefProxyConfigTrackerImplCommandLineTest,
     testing::ValuesIn(kCommandLineTestParams));
 
 }  // namespace