Make CrOS proxy configuration write prefs directly.

chrome/browser/net/pref_proxy_config_service_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_service.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/prefs/pref_service_mock_builder.h"
@@ skipping 49 matching lines @@
   MOCK_METHOD1(OnProxyConfigChanged, void(const net::ProxyConfig&));
 };
 
 template<typename TESTBASE>
 class PrefProxyConfigServiceTestBase : public TESTBASE {
  protected:
   PrefProxyConfigServiceTestBase()
       : ui_thread_(BrowserThread::UI, &loop_),
         io_thread_(BrowserThread::IO, &loop_) {}
 
-  virtual void Init(PrefService* pref_service) {
+  virtual void Init(PrefService* pref_service, PrefService* fallback) {
     ASSERT_TRUE(pref_service);
     PrefProxyConfigService::RegisterPrefs(pref_service);
+    if (fallback)
+      PrefProxyConfigService::RegisterPrefs(fallback);
     fixed_config_.set_pac_url(GURL(kFixedPacUrl));
     delegate_service_ = new TestProxyConfigService(fixed_config_);
-    proxy_config_tracker_ = new PrefProxyConfigTracker(pref_service);
+    proxy_config_tracker_ = new PrefProxyConfigTracker(pref_service, fallback);
     proxy_config_service_.reset(
         new PrefProxyConfigService(proxy_config_tracker_.get(),
                                    delegate_service_));
   }
 
   virtual void TearDown() {
     proxy_config_tracker_->DetachFromPrefService();
     loop_.RunAllPending();
     proxy_config_service_.reset();
   }
 
   MessageLoop loop_;
   TestProxyConfigService* delegate_service_; // weak
   scoped_ptr<PrefProxyConfigService> proxy_config_service_;
   net::ProxyConfig fixed_config_;
 
  private:
   scoped_refptr<PrefProxyConfigTracker> proxy_config_tracker_;
   BrowserThread ui_thread_;
   BrowserThread io_thread_;
 };
 
 class PrefProxyConfigServiceTest
     : public PrefProxyConfigServiceTestBase<testing::Test> {
  protected:
   virtual void SetUp() {
-    pref_service_.reset(new TestingPrefService());
-    Init(pref_service_.get());
+    Init(&pref_service_, NULL);
   }
 
-  scoped_ptr<TestingPrefService> pref_service_;
+  TestingPrefService pref_service_;
 };
 
 TEST_F(PrefProxyConfigServiceTest, BaseConfiguration) {
   net::ProxyConfig actual_config;
   proxy_config_service_->GetLatestProxyConfig(&actual_config);
   EXPECT_EQ(GURL(kFixedPacUrl), actual_config.pac_url());
 }
 
 TEST_F(PrefProxyConfigServiceTest, DynamicPrefOverrides) {
-  pref_service_->SetManagedPref(
+  pref_service_.SetManagedPref(
       prefs::kProxy,
       ProxyConfigDictionary::CreateFixedServers("http://example.com:3128", ""));
   loop_.RunAllPending();
 
   net::ProxyConfig actual_config;
   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_proxy,
             net::ProxyServer::FromURI("http://example.com:3128",
                                       net::ProxyServer::SCHEME_HTTP));
 
-  pref_service_->SetManagedPref(prefs::kProxy,
+  pref_service_.SetManagedPref(prefs::kProxy,
                                 ProxyConfigDictionary::CreateAutoDetect());
   loop_.RunAllPending();
 
   proxy_config_service_->GetLatestProxyConfig(&actual_config);
   EXPECT_TRUE(actual_config.auto_detect());
 }
 
 // Compares proxy configurations, but allows different identifiers.
 MATCHER_P(ProxyConfigMatches, config, "") {
   net::ProxyConfig reference(config);
@@ skipping 13 matching lines @@
   delegate_service_->SetProxyConfig(config2);
   loop_.RunAllPending();
   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))).Times(1);
-  pref_service_->SetManagedPref(
+  pref_service_.SetManagedPref(
       prefs::kProxy,
       ProxyConfigDictionary::CreatePacScript(kFixedPacUrl));
   loop_.RunAllPending();
   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);
   loop_.RunAllPending();
   Mock::VerifyAndClearExpectations(&observer);
 
   // Clear the override should switch back to the fixed configuration.
   EXPECT_CALL(observer,
               OnProxyConfigChanged(ProxyConfigMatches(config3))).Times(1);
-  pref_service_->RemoveManagedPref(prefs::kProxy);
+  pref_service_.RemoveManagedPref(prefs::kProxy);
   loop_.RunAllPending();
   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))).Times(1);
   delegate_service_->SetProxyConfig(config4);
   loop_.RunAllPending();
   Mock::VerifyAndClearExpectations(&observer);
 
   proxy_config_service_->RemoveObserver(&observer);
 }
 
+class PrefProxyConfigServiceFallbackTest
+    : public PrefProxyConfigServiceTestBase<testing::Test> {
+ protected:
+  virtual void SetUp() {
+    Init(&pref_service_, &fallback_pref_service_);
+  }
+
+  TestingPrefService pref_service_;
+  TestingPrefService fallback_pref_service_;
+};
+
+TEST_F(PrefProxyConfigServiceFallbackTest, NoFallback) {
+  pref_service_.SetUserPref(
+      prefs::kProxy,
+      ProxyConfigDictionary::CreateFixedServers("http://example.com:3128", ""));
+  loop_.RunAllPending();
+
+  net::ProxyConfig actual_config;
+  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_proxy,
+            net::ProxyServer::FromURI("http://example.com:3128",
+                                      net::ProxyServer::SCHEME_HTTP));
+}
+
+TEST_F(PrefProxyConfigServiceFallbackTest, Fallback) {
+  fallback_pref_service_.SetUserPref(
+      prefs::kProxy,
+      ProxyConfigDictionary::CreateFixedServers("http://example.com:3128", ""));
+  loop_.RunAllPending();
+
+  net::ProxyConfig actual_config;
+  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_proxy,
+            net::ProxyServer::FromURI("http://example.com:3128",
+                                      net::ProxyServer::SCHEME_HTTP));
+}
+
+TEST_F(PrefProxyConfigServiceFallbackTest, FallbackWithPolicy) {
+  pref_service_.SetManagedPref(
+      prefs::kProxy,
+      ProxyConfigDictionary::CreateAutoDetect());
+  fallback_pref_service_.SetUserPref(
+      prefs::kProxy,
+      ProxyConfigDictionary::CreateFixedServers("http://example.com:3128", ""));
+  loop_.RunAllPending();
+
+  net::ProxyConfig actual_config;
+  proxy_config_service_->GetLatestProxyConfig(&actual_config);
+  EXPECT_TRUE(actual_config.auto_detect());
+}
+
+TEST_F(PrefProxyConfigServiceFallbackTest, FallbackPolicy) {
+  fallback_pref_service_.SetManagedPref(
+      prefs::kProxy,
+      ProxyConfigDictionary::CreateFixedServers("http://example.com:3128", ""));
+  pref_service_.SetUserPref(
+      prefs::kProxy,
+      ProxyConfigDictionary::CreateAutoDetect());
+  loop_.RunAllPending();
+
+  net::ProxyConfig actual_config;
+  proxy_config_service_->GetLatestProxyConfig(&actual_config);
+  EXPECT_TRUE(actual_config.auto_detect());
+}
+
 // Test parameter object for testing command line proxy configuration.
 struct CommandLineTestParams {
   // Explicit assignment operator, so testing::TestWithParam works with MSVC.
   CommandLineTestParams& operator=(const CommandLineTestParams& other) {
     description = other.description;
     for (unsigned int i = 0; i < arraysize(switches); i++)
       switches[i] = other.switches[i];
     is_null = other.is_null;
     auto_detect = other.auto_detect;
     pac_url = other.pac_url;
@@ skipping 32 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_).Create());
-    Init(pref_service_.get());
+    Init(pref_service_.get(), NULL);
   }
 
  private:
   CommandLine command_line_;
   scoped_ptr<PrefService> pref_service_;
 };
 
 TEST_P(PrefProxyConfigServiceCommandLineTest, CommandLine) {
   net::ProxyConfig config;
   proxy_config_service_->GetLatestProxyConfig(&config);
@@ skipping 117 matching lines @@
     net::ProxyRulesExpectation::Empty(),
   },
 };
 
 INSTANTIATE_TEST_CASE_P(
     PrefProxyConfigServiceCommandLineTestInstance,
     PrefProxyConfigServiceCommandLineTest,
     testing::ValuesIn(kCommandLineTestParams));
 
 }  // namespace