diff options
Diffstat (limited to 'net/proxy/proxy_service_unittest.cc')
-rw-r--r-- | net/proxy/proxy_service_unittest.cc | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/net/proxy/proxy_service_unittest.cc b/net/proxy/proxy_service_unittest.cc index 8166a42..d33ac6d 100644 --- a/net/proxy/proxy_service_unittest.cc +++ b/net/proxy/proxy_service_unittest.cc @@ -301,7 +301,7 @@ TEST(ProxyServiceTest, ProxyBypassList) { MockProxyResolver resolver; resolver.config->proxy_server = "foopy1:8080;foopy2:9090"; resolver.config->auto_detect = false; - resolver.config->proxy_bypass_local_names = true; + resolver.config->proxy_bypass = "<local>"; net::ProxyService service(&resolver); GURL url("http://www.google.com/"); @@ -318,9 +318,7 @@ TEST(ProxyServiceTest, ProxyBypassList) { EXPECT_EQ(rv, net::OK); EXPECT_TRUE(info1.is_direct()); - resolver.config->proxy_bypass.clear(); - resolver.config->proxy_bypass.push_back("*.org"); - resolver.config->proxy_bypass_local_names = true; + resolver.config->proxy_bypass = "<local>;*.org"; net::ProxyService service2(&resolver); GURL test_url2("http://www.webkit.org"); net::ProxyInfo info2; @@ -328,10 +326,7 @@ TEST(ProxyServiceTest, ProxyBypassList) { EXPECT_EQ(rv, net::OK); EXPECT_TRUE(info2.is_direct()); - resolver.config->proxy_bypass.clear(); - resolver.config->proxy_bypass.push_back("*.org"); - resolver.config->proxy_bypass.push_back("7*"); - resolver.config->proxy_bypass_local_names = true; + resolver.config->proxy_bypass = "<local>;*.org;7*"; net::ProxyService service3(&resolver); GURL test_url3("http://74.125.19.147"); net::ProxyInfo info3; @@ -339,9 +334,7 @@ TEST(ProxyServiceTest, ProxyBypassList) { EXPECT_EQ(rv, net::OK); EXPECT_TRUE(info3.is_direct()); - resolver.config->proxy_bypass.clear(); - resolver.config->proxy_bypass.push_back("*.org"); - resolver.config->proxy_bypass_local_names = true; + resolver.config->proxy_bypass = "<local>;*.org;"; net::ProxyService service4(&resolver); GURL test_url4("http://www.msn.com"); net::ProxyInfo info4; @@ -349,9 +342,7 @@ TEST(ProxyServiceTest, ProxyBypassList) { EXPECT_EQ(rv, net::OK); EXPECT_FALSE(info4.is_direct()); - resolver.config->proxy_bypass.clear(); - resolver.config->proxy_bypass.push_back("*.MSN.COM"); - resolver.config->proxy_bypass_local_names = true; + resolver.config->proxy_bypass = "<local>;*.MSN.COM;"; net::ProxyService service5(&resolver); GURL test_url5("http://www.msnbc.msn.com"); net::ProxyInfo info5; @@ -359,9 +350,7 @@ TEST(ProxyServiceTest, ProxyBypassList) { EXPECT_EQ(rv, net::OK); EXPECT_TRUE(info5.is_direct()); - resolver.config->proxy_bypass.clear(); - resolver.config->proxy_bypass.push_back("*.msn.com"); - resolver.config->proxy_bypass_local_names = true; + resolver.config->proxy_bypass = "<local>;*.msn.com;"; net::ProxyService service6(&resolver); GURL test_url6("HTTP://WWW.MSNBC.MSN.COM"); net::ProxyInfo info6; |