Index: trunk/src/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_configurator_unittest.cc |
=================================================================== |
--- trunk/src/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_configurator_unittest.cc (revision 273823) |
+++ trunk/src/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_configurator_unittest.cc (working copy) |
@@ -48,35 +48,19 @@ |
config_->Enable(false, |
false, |
"https://www.foo.com:443/", |
- "http://www.bar.com:80/", |
- ""); |
+ "http://www.bar.com:80/"); |
CheckProxyConfig( |
"fixed_servers", |
"http=https://www.foo.com:443,http://www.bar.com:80,direct://;", |
""); |
} |
- |
-TEST_F(DataReductionProxyConfigTest, TestUnrestrictedSSL) { |
- config_->Enable(false, |
- false, |
- "https://www.foo.com:443/", |
- "http://www.bar.com:80/", |
- "http://www.ssl.com:80/"); |
- CheckProxyConfig( |
- "fixed_servers", |
- "http=https://www.foo.com:443,http://www.bar.com:80,direct://;" |
- "https=http://www.ssl.com:80,direct://;", |
- ""); |
-} |
- |
TEST_F(DataReductionProxyConfigTest, TestUnrestrictedWithBypassRule) { |
config_->AddHostPatternToBypass("<local>"); |
config_->AddHostPatternToBypass("*.goo.com"); |
config_->Enable(false, |
false, |
"https://www.foo.com:443/", |
- "http://www.bar.com:80/", |
- ""); |
+ "http://www.bar.com:80/"); |
CheckProxyConfig( |
"fixed_servers", |
"http=https://www.foo.com:443,http://www.bar.com:80,direct://;", |
@@ -84,7 +68,10 @@ |
} |
TEST_F(DataReductionProxyConfigTest, TestUnrestrictedWithoutFallback) { |
- config_->Enable(false, false, "https://www.foo.com:443/", "", ""); |
+ config_->Enable(false, |
+ false, |
+ "https://www.foo.com:443/", |
+ ""); |
CheckProxyConfig("fixed_servers", |
"http=https://www.foo.com:443,direct://;", |
""); |
@@ -94,8 +81,7 @@ |
config_->Enable(true, |
false, |
"https://www.foo.com:443/", |
- "http://www.bar.com:80/", |
- ""); |
+ "http://www.bar.com:80/"); |
CheckProxyConfig("fixed_servers", |
"http=http://www.bar.com:80,direct://;", |
""); |
@@ -105,8 +91,7 @@ |
config_->Enable(false, |
true, |
"https://www.foo.com:443/", |
- "http://www.bar.com:80/", |
- ""); |
+ "http://www.bar.com:80/"); |
CheckProxyConfig("fixed_servers", |
"http=https://www.foo.com:443,direct://;", |
""); |
@@ -116,8 +101,7 @@ |
config_->Enable(true, |
true, |
"https://www.foo.com:443/", |
- "http://www.bar.com:80/", |
- ""); |
+ "http://www.bar.com:80/"); |
CheckProxyConfig("system", "", ""); |
} |