diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/proxy/proxy_config.cc | 2 | ||||
-rw-r--r-- | net/proxy/proxy_config_unittest.cc | 22 |
2 files changed, 23 insertions, 1 deletions
diff --git a/net/proxy/proxy_config.cc b/net/proxy/proxy_config.cc index 5284327..a1aa92c 100644 --- a/net/proxy/proxy_config.cc +++ b/net/proxy/proxy_config.cc @@ -26,7 +26,7 @@ bool ProxyConfig::Equals(const ProxyConfig& other) const { } bool ProxyConfig::MayRequirePACResolver() const { - return auto_detect || !pac_url.is_empty(); + return auto_detect || pac_url.is_valid(); } void ProxyConfig::ProxyRules::ParseFromString(const std::string& proxy_rules) { diff --git a/net/proxy/proxy_config_unittest.cc b/net/proxy/proxy_config_unittest.cc index c72c8c5..259f1fa 100644 --- a/net/proxy/proxy_config_unittest.cc +++ b/net/proxy/proxy_config_unittest.cc @@ -400,6 +400,28 @@ TEST(ProxyConfigTest, ToString) { } } +TEST(ProxyConfigTest, MayRequirePACResolver) { + { + ProxyConfig config; + EXPECT_FALSE(config.MayRequirePACResolver()); + } + { + ProxyConfig config; + config.auto_detect = true; + EXPECT_TRUE(config.MayRequirePACResolver()); + } + { + ProxyConfig config; + config.pac_url = GURL("http://custom/pac.js"); + EXPECT_TRUE(config.MayRequirePACResolver()); + } + { + ProxyConfig config; + config.pac_url = GURL("notvalid"); + EXPECT_FALSE(config.MayRequirePACResolver()); + } +} + } // namespace } // namespace net |