diff options
Diffstat (limited to 'chrome/browser/net/pref_proxy_config_service_unittest.cc')
| -rw-r--r-- | chrome/browser/net/pref_proxy_config_service_unittest.cc | 53 |
1 files changed, 36 insertions, 17 deletions
diff --git a/chrome/browser/net/pref_proxy_config_service_unittest.cc b/chrome/browser/net/pref_proxy_config_service_unittest.cc index fd24dd6..dad5c53 100644 --- a/chrome/browser/net/pref_proxy_config_service_unittest.cc +++ b/chrome/browser/net/pref_proxy_config_service_unittest.cc @@ -7,6 +7,8 @@ #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" @@ -65,12 +67,12 @@ class PrefProxyConfigServiceTestBase : public TESTBASE { : ui_thread_(BrowserThread::UI, &loop_), io_thread_(BrowserThread::IO, &loop_) {} - virtual void SetUp() { - ASSERT_TRUE(pref_service_.get()); - PrefProxyConfigService::RegisterUserPrefs(pref_service_.get()); + virtual void Init(PrefService* pref_service) { + ASSERT_TRUE(pref_service); + PrefProxyConfigService::RegisterUserPrefs(pref_service); fixed_config_.set_pac_url(GURL(kFixedPacUrl)); delegate_service_ = new TestProxyConfigService(fixed_config_); - proxy_config_tracker_ = new PrefProxyConfigTracker(pref_service_.get()); + proxy_config_tracker_ = new PrefProxyConfigTracker(pref_service); proxy_config_service_.reset( new PrefProxyConfigService(proxy_config_tracker_.get(), delegate_service_)); @@ -80,12 +82,10 @@ class PrefProxyConfigServiceTestBase : public TESTBASE { proxy_config_tracker_->DetachFromPrefService(); loop_.RunAllPending(); proxy_config_service_.reset(); - pref_service_.reset(); } MessageLoop loop_; TestProxyConfigService* delegate_service_; // weak - scoped_ptr<TestingPrefService> pref_service_; scoped_ptr<PrefProxyConfigService> proxy_config_service_; net::ProxyConfig fixed_config_; @@ -99,9 +99,11 @@ class PrefProxyConfigServiceTest : public PrefProxyConfigServiceTestBase<testing::Test> { protected: virtual void SetUp() { - pref_service_.reset(new TestingPrefService); - PrefProxyConfigServiceTestBase<testing::Test>::SetUp(); + pref_service_.reset(new TestingPrefService()); + Init(pref_service_.get()); } + + scoped_ptr<TestingPrefService> pref_service_; }; TEST_F(PrefProxyConfigServiceTest, BaseConfiguration) { @@ -113,6 +115,9 @@ TEST_F(PrefProxyConfigServiceTest, BaseConfiguration) { TEST_F(PrefProxyConfigServiceTest, DynamicPrefOverrides) { pref_service_->SetManagedPref( prefs::kProxyServer, Value::CreateStringValue("http://example.com:3128")); + pref_service_->SetManagedPref( + prefs::kProxyMode, + Value::CreateIntegerValue(ProxyPrefs::MODE_FIXED_SERVERS)); loop_.RunAllPending(); net::ProxyConfig actual_config; @@ -125,7 +130,8 @@ TEST_F(PrefProxyConfigServiceTest, DynamicPrefOverrides) { net::ProxyServer::SCHEME_HTTP)); pref_service_->SetManagedPref( - prefs::kProxyAutoDetect, Value::CreateBooleanValue(true)); + prefs::kProxyMode, + Value::CreateIntegerValue(ProxyPrefs::MODE_AUTO_DETECT)); loop_.RunAllPending(); proxy_config_service_->GetLatestProxyConfig(&actual_config); @@ -155,10 +161,20 @@ TEST_F(PrefProxyConfigServiceTest, Observers) { // 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::MODE_PAC_SCRIPT)); loop_.RunAllPending(); Mock::VerifyAndClearExpectations(&observer); @@ -174,6 +190,11 @@ TEST_F(PrefProxyConfigServiceTest, Observers) { // 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 to 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); @@ -240,13 +261,14 @@ class PrefProxyConfigServiceCommandLineTest else if (name) command_line_.AppendSwitch(name); } - pref_service_.reset(new TestingPrefService(NULL, NULL, &command_line_)); - PrefProxyConfigServiceTestBase< - testing::TestWithParam<CommandLineTestParams> >::SetUp(); + pref_service_.reset( + PrefServiceMockBuilder().WithCommandLine(&command_line_).Create()); + Init(pref_service_.get()); } private: CommandLine command_line_; + scoped_ptr<PrefService> pref_service_; }; TEST_P(PrefProxyConfigServiceCommandLineTest, CommandLine) { @@ -348,19 +370,16 @@ static const CommandLineTestParams kCommandLineTestParams[] = { "*.google.com,foo.com:99,1.2.3.4:22,127.0.0.1/8"), }, { - "Pac URL with proxy bypass URLs", + "Pac URL", // 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", |