Introduce a separate preference for 'proxy server mode'

chrome/browser/net/pref_proxy_config_service_unittest.cc

 // Copyright (c) 2010 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"
+#include "chrome/browser/prefs/proxy_prefs.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/testing_pref_service.h"
 #include "net/proxy/proxy_config_service_common_unittest.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::_;
 using testing::Mock;
 
@@ skipping 86 matching lines @@
 
 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(
       prefs::kProxyServer, Value::CreateStringValue("http://example.com:3128"));
+  pref_service_->SetManagedPref(
+      prefs::kProxyMode, Value::CreateIntegerValue(ProxyPrefs::FIXED_SERVERS));
   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::kProxyAutoDetect, Value::CreateBooleanValue(true));
+      prefs::kProxyMode, Value::CreateIntegerValue(ProxyPrefs::AUTO_DETECT));
   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);
   reference.set_id(arg.id());
   return reference.Equals(arg);
 }
 
 TEST_F(PrefProxyConfigServiceTest, Observers) {
   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))).Times(1);
   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(prefs::kProxyPacUrl,
                                 Value::CreateStringValue(kFixedPacUrl));
+  // The above does not trigger a notification, because PrefProxyConfig still
+  // sees the mode as the default (ProxyPrefs::SYSTEM), so that it doesn't claim
+  // to have proxy config.
+  // TODO(battre): Remove this comment when http://crbug.com/65732 is
+  // resolved.
+  pref_service_->SetManagedPref(
+      prefs::kProxyMode, Value::CreateIntegerValue(ProxyPrefs::PAC_SCRIPT));
   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::kProxyMode);
+  // The above switches the mode the default (ProxyPrefs::SYSTEM), so the next
+  // removal won't bother PrefProxyConfigService.
+  // TODO(battre): Remove this comment when http://crbug.com/65732 is
+  // completed.
   pref_service_->RemoveManagedPref(prefs::kProxyPacUrl);
   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);
@@ skipping 155 matching lines @@
     false,                                              // is_null
     false,                                              // auto_detect
     GURL(),                                             // pac_url
     net::ProxyRulesExpectation::PerScheme(
         "httpproxy:8888",  // http
         "",                // https
         "ftpproxy:8889",   // ftp
         "*.google.com,foo.com:99,1.2.3.4:22,127.0.0.1/8"),
   },
   {
-    "Pac URL with proxy bypass URLs",
+    "Pac URL",

[Mattias Nissler (ping if slow), 2010/12/22 10:22:12]

I think when reading the code, we came to the conclusion that the bypass list is
ignored if you set a PAC URL, right? The old code here suggests they are not
ignored, can you verify please?

[battre, 2010/12/22 14:41:16]

Yes, verified. See TEST(ProxyServiceTest, BypassDoesntApplyToPac) in
proxy_service_unittest.cc

     // Input
     {
       { switches::kProxyPacUrl, "http://wpad/wpad.dat" },
-      { switches::kProxyBypassList,
-        ".google.com, foo.com:99, 1.2.3.4:22, 127.0.0.1/8" },
     },
     // Expected result
     false,                                              // is_null
     false,                                              // auto_detect
     GURL("http://wpad/wpad.dat"),                       // pac_url
-    net::ProxyRulesExpectation::EmptyWithBypass(
-        "*.google.com,foo.com:99,1.2.3.4:22,127.0.0.1/8"),
+    net::ProxyRulesExpectation::Empty(),
   },
   {
     "Autodetect",
     // Input
     {
       { switches::kProxyAutoDetect, NULL },
     },
     // Expected result
     false,                                              // is_null
     true,                                               // auto_detect
     GURL(),                                             // pac_url
     net::ProxyRulesExpectation::Empty(),
   },
 };
 
 INSTANTIATE_TEST_CASE_P(
     PrefProxyConfigServiceCommandLineTestInstance,
     PrefProxyConfigServiceCommandLineTest,
     testing::ValuesIn(kCommandLineTestParams));
 
 }  // namespace