Revert https://codereview.chromium.org/2860033003

components/proxy_config/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 "components/proxy_config/pref_proxy_config_tracker_impl.h"
 
 #include <memory>
 #include <string>
 
 #include "base/files/file_path.h"
@@ skipping 56 matching lines @@
 // A mock observer for capturing callbacks.
 class MockObserver : public net::ProxyConfigService::Observer {
  public:
   MOCK_METHOD2(OnProxyConfigChanged,
                void(const net::ProxyConfig&,
                     net::ProxyConfigService::ConfigAvailability));
 };
 
 class PrefProxyConfigTrackerImplTest : public testing::Test {
  protected:
-  PrefProxyConfigTrackerImplTest() {}
-
-  // Initializes the proxy config service. The delegate config service has the
-  // specified initial config availability.
-  void InitConfigService(net::ProxyConfigService::ConfigAvailability
-                             delegate_config_availability) {
+  PrefProxyConfigTrackerImplTest() {
     pref_service_.reset(new TestingPrefServiceSimple());
     PrefProxyConfigTrackerImpl::RegisterPrefs(pref_service_->registry());
     fixed_config_.set_pac_url(GURL(kFixedPacUrl));
     delegate_service_ =
-        new TestProxyConfigService(fixed_config_, delegate_config_availability);
+        new TestProxyConfigService(fixed_config_,
+                                   net::ProxyConfigService::CONFIG_VALID);
     proxy_config_tracker_.reset(new PrefProxyConfigTrackerImpl(
         pref_service_.get(), base::ThreadTaskRunnerHandle::Get()));
     proxy_config_service_ =
         proxy_config_tracker_->CreateTrackingProxyConfigService(
             std::unique_ptr<net::ProxyConfigService>(delegate_service_));
+    // SetProxyConfigServiceImpl triggers update of initial prefs proxy
+    // config by tracker to chrome proxy config service, so flush all pending
+    // tasks so that tests start fresh.
+    base::RunLoop().RunUntilIdle();
   }
 
   ~PrefProxyConfigTrackerImplTest() override {
     proxy_config_tracker_->DetachFromPrefService();
     base::RunLoop().RunUntilIdle();
     proxy_config_tracker_.reset();
     proxy_config_service_.reset();
   }
 
   base::MessageLoop loop_;
   std::unique_ptr<TestingPrefServiceSimple> pref_service_;
   TestProxyConfigService* delegate_service_; // weak
   std::unique_ptr<net::ProxyConfigService> proxy_config_service_;
   net::ProxyConfig fixed_config_;
+
+ private:
   std::unique_ptr<PrefProxyConfigTrackerImpl> proxy_config_tracker_;
 };
 
 TEST_F(PrefProxyConfigTrackerImplTest, BaseConfiguration) {
-  InitConfigService(net::ProxyConfigService::CONFIG_VALID);
   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) {
-  InitConfigService(net::ProxyConfigService::CONFIG_VALID);
   pref_service_->SetManagedPref(proxy_config::prefs::kProxy,
                                 ProxyConfigDictionary::CreateFixedServers(
                                     "http://example.com:3128", std::string()));
   base::RunLoop().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,
@@ skipping 12 matching lines @@
 }
 
 // Compares proxy configurations, but allows different identifiers.
 MATCHER_P(ProxyConfigMatches, config, "") {
   net::ProxyConfig reference(config);
   reference.set_id(arg.id());
   return reference.Equals(arg);
 }
 
 TEST_F(PrefProxyConfigTrackerImplTest, Observers) {
-  InitConfigService(net::ProxyConfigService::CONFIG_VALID);
   const net::ProxyConfigService::ConfigAvailability CONFIG_VALID =
       net::ProxyConfigService::CONFIG_VALID;
   MockObserver observer;
   proxy_config_service_->AddObserver(&observer);
 
   // Firing the observers in the delegate should trigger a notification.
   net::ProxyConfig config2;
   config2.set_auto_detect(true);
   EXPECT_CALL(observer, OnProxyConfigChanged(ProxyConfigMatches(config2),
                                              CONFIG_VALID)).Times(1);
@@ skipping 35 matching lines @@
   EXPECT_CALL(observer, OnProxyConfigChanged(ProxyConfigMatches(config4),
                                              CONFIG_VALID)).Times(1);
   delegate_service_->SetProxyConfig(config4, CONFIG_VALID);
   base::RunLoop().RunUntilIdle();
   Mock::VerifyAndClearExpectations(&observer);
 
   proxy_config_service_->RemoveObserver(&observer);
 }
 
 TEST_F(PrefProxyConfigTrackerImplTest, Fallback) {
-  InitConfigService(net::ProxyConfigService::CONFIG_VALID);
   const net::ProxyConfigService::ConfigAvailability CONFIG_VALID =
       net::ProxyConfigService::CONFIG_VALID;
   MockObserver observer;
   net::ProxyConfig actual_config;
   delegate_service_->SetProxyConfig(net::ProxyConfig::CreateDirect(),
                                     net::ProxyConfigService::CONFIG_UNSET);
   proxy_config_service_->AddObserver(&observer);
 
   // Prepare test data.
   net::ProxyConfig recommended_config = net::ProxyConfig::CreateAutoDetect();
@@ skipping 33 matching lines @@
   base::RunLoop().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) {
-  InitConfigService(net::ProxyConfigService::CONFIG_VALID);
   pref_service_->SetRecommendedPref(proxy_config::prefs::kProxy,
                                     ProxyConfigDictionary::CreateAutoDetect());
   pref_service_->SetUserPref(proxy_config::prefs::kProxy,
                              ProxyConfigDictionary::CreateSystem());
   base::RunLoop().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());
 }
 
-// Test the case where the delegate service gets a config only after the service
-// is created.
-TEST_F(PrefProxyConfigTrackerImplTest, DelegateConfigServiceGetsConfigLate) {
-  InitConfigService(net::ProxyConfigService::CONFIG_PENDING);
-
-  testing::StrictMock<MockObserver> observer;
-  proxy_config_service_->AddObserver(&observer);
-
-  net::ProxyConfig actual_config;
-  EXPECT_EQ(net::ProxyConfigService::CONFIG_PENDING,
-            proxy_config_service_->GetLatestProxyConfig(&actual_config));
-
-  // When the delegate service gets the config, the other service should update
-  // its observers.
-  EXPECT_CALL(observer,
-              OnProxyConfigChanged(ProxyConfigMatches(fixed_config_),
-                                   net::ProxyConfigService::CONFIG_VALID))
-      .Times(1);
-  delegate_service_->SetProxyConfig(fixed_config_,
-                                    net::ProxyConfigService::CONFIG_VALID);
-
-  // Since no prefs were set, should just use the delegated config service's
-  // settings.
-  EXPECT_EQ(net::ProxyConfigService::CONFIG_VALID,
-            proxy_config_service_->GetLatestProxyConfig(&actual_config));
-  EXPECT_EQ(GURL(kFixedPacUrl), actual_config.pac_url());
-
-  proxy_config_service_->RemoveObserver(&observer);
-}
-
 }  // namespace