Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(673)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/data_reduction_proxy/core/browser/data_reduction_proxy_configurator_unittest.cc

Issue 1871783002: Remove the Data Reduction Proxy TLS experiment code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/data_reduction_proxy/core/browser/data_reduction_proxy_configurator_test_utils.cc ('k') | components/data_reduction_proxy/core/browser/data_reduction_proxy_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_configurator_unittest.cc
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_configurator_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_configurator_unittest.cc
index f6566357b581fe6830832bc0b3386e1afe316198..995dff5f7d81e36597387af51a6a1823628b64f6 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_configurator_unittest.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_configurator_unittest.cc
@@ -45,7 +45,6 @@ class DataReductionProxyConfiguratorTest : public testing::Test {
void CheckProxyConfig(
const net::ProxyConfig::ProxyRules::Type& expected_rules_type,
const std::string& expected_http_proxies,
- const std::string& expected_https_proxies,
const std::string& expected_bypass_list) {
test_context_->RunUntilIdle();
const net::ProxyConfig::ProxyRules& rules =
@@ -54,7 +53,7 @@ class DataReductionProxyConfiguratorTest : public testing::Test {
if (net::ProxyConfig::ProxyRules::TYPE_PROXY_PER_SCHEME ==
expected_rules_type) {
ASSERT_EQ(expected_http_proxies, rules.proxies_for_http.ToPacString());
- ASSERT_EQ(expected_https_proxies, rules.proxies_for_https.ToPacString());
+ ASSERT_EQ(std::string(), rules.proxies_for_https.ToPacString());
ASSERT_EQ(expected_bypass_list, rules.bypass_rules.ToString());
}
}
@@ -65,104 +64,76 @@ class DataReductionProxyConfiguratorTest : public testing::Test {
};
TEST_F(DataReductionProxyConfiguratorTest, TestUnrestricted) {
- config_->Enable(
- false, BuildProxyList("https://www.foo.com:443", "http://www.bar.com:80"),
- BuildProxyList(std::string(), std::string()));
+ config_->Enable(false, BuildProxyList("https://www.foo.com:443",
+ "http://www.bar.com:80"));
CheckProxyConfig(net::ProxyConfig::ProxyRules::TYPE_PROXY_PER_SCHEME,
"HTTPS www.foo.com:443;PROXY www.bar.com:80;DIRECT",
- std::string(), std::string());
+ std::string());
}
TEST_F(DataReductionProxyConfiguratorTest, TestUnrestrictedQuic) {
config_->Enable(
- false, BuildProxyList("quic://www.foo.com:443", "http://www.bar.com:80"),
- BuildProxyList(std::string(), std::string()));
+ false, BuildProxyList("quic://www.foo.com:443", "http://www.bar.com:80"));
CheckProxyConfig(net::ProxyConfig::ProxyRules::TYPE_PROXY_PER_SCHEME,
"QUIC www.foo.com:443;PROXY www.bar.com:80;DIRECT",
- std::string(), std::string());
-}
-
-TEST_F(DataReductionProxyConfiguratorTest, TestUnrestrictedSSL) {
- config_->Enable(
- false, BuildProxyList("https://www.foo.com:443", "http://www.bar.com:80"),
- BuildProxyList("http://www.ssl.com:80", std::string()));
- CheckProxyConfig(net::ProxyConfig::ProxyRules::TYPE_PROXY_PER_SCHEME,
- "HTTPS www.foo.com:443;PROXY www.bar.com:80;DIRECT",
- "PROXY www.ssl.com:80;DIRECT", std::string());
-}
-
-TEST_F(DataReductionProxyConfiguratorTest, TestUnrestrictedSSLQuic) {
- config_->Enable(
- false, BuildProxyList("quic://www.foo.com:443", "http://www.bar.com:80"),
- BuildProxyList("http://www.ssl.com:80", std::string()));
- CheckProxyConfig(net::ProxyConfig::ProxyRules::TYPE_PROXY_PER_SCHEME,
- "QUIC www.foo.com:443;PROXY www.bar.com:80;DIRECT",
- "PROXY www.ssl.com:80;DIRECT", std::string());
+ std::string());
}
TEST_F(DataReductionProxyConfiguratorTest, TestUnrestrictedWithBypassRule) {
config_->AddHostPatternToBypass("<local>");
config_->AddHostPatternToBypass("*.goo.com");
- config_->Enable(
- false, BuildProxyList("https://www.foo.com:443", "http://www.bar.com:80"),
- BuildProxyList(std::string(), std::string()));
+ config_->Enable(false, BuildProxyList("https://www.foo.com:443",
+ "http://www.bar.com:80"));
CheckProxyConfig(net::ProxyConfig::ProxyRules::TYPE_PROXY_PER_SCHEME,
"HTTPS www.foo.com:443;PROXY www.bar.com:80;DIRECT",
- std::string(), "<local>;*.goo.com;");
+ "<local>;*.goo.com;");
}
TEST_F(DataReductionProxyConfiguratorTest, TestUnrestrictedWithBypassRuleQuic) {
config_->AddHostPatternToBypass("<local>");
config_->AddHostPatternToBypass("*.goo.com");
config_->Enable(
- false, BuildProxyList("quic://www.foo.com:443", "http://www.bar.com:80"),
- BuildProxyList(std::string(), std::string()));
+ false, BuildProxyList("quic://www.foo.com:443", "http://www.bar.com:80"));
CheckProxyConfig(net::ProxyConfig::ProxyRules::TYPE_PROXY_PER_SCHEME,
"QUIC www.foo.com:443;PROXY www.bar.com:80;DIRECT",
- std::string(), "<local>;*.goo.com;");
+ "<local>;*.goo.com;");
}
TEST_F(DataReductionProxyConfiguratorTest, TestUnrestrictedWithoutFallback) {
config_->Enable(false,
- BuildProxyList("https://www.foo.com:443", std::string()),
- BuildProxyList(std::string(), std::string()));
+ BuildProxyList("https://www.foo.com:443", std::string()));
CheckProxyConfig(net::ProxyConfig::ProxyRules::TYPE_PROXY_PER_SCHEME,
- "HTTPS www.foo.com:443;DIRECT", std::string(),
- std::string());
+ "HTTPS www.foo.com:443;DIRECT", std::string());
}
TEST_F(DataReductionProxyConfiguratorTest,
TestUnrestrictedWithoutFallbackQuic) {
config_->Enable(false,
- BuildProxyList("quic://www.foo.com:443", std::string()),
- BuildProxyList(std::string(), std::string()));
+ BuildProxyList("quic://www.foo.com:443", std::string()));
CheckProxyConfig(net::ProxyConfig::ProxyRules::TYPE_PROXY_PER_SCHEME,
- "QUIC www.foo.com:443;DIRECT", std::string(), std::string());
+ "QUIC www.foo.com:443;DIRECT", std::string());
}
TEST_F(DataReductionProxyConfiguratorTest, TestRestricted) {
config_->Enable(
- true, BuildProxyList("https://www.foo.com:443", "http://www.bar.com:80"),
- BuildProxyList(std::string(), std::string()));
+ true, BuildProxyList("https://www.foo.com:443", "http://www.bar.com:80"));
CheckProxyConfig(net::ProxyConfig::ProxyRules::TYPE_PROXY_PER_SCHEME,
- "PROXY www.bar.com:80;DIRECT", std::string(), std::string());
+ "PROXY www.bar.com:80;DIRECT", std::string());
}
TEST_F(DataReductionProxyConfiguratorTest, TestRestrictedQuic) {
config_->Enable(
- true, BuildProxyList("quic://www.foo.com:443", "http://www.bar.com:80"),
- BuildProxyList(std::string(), std::string()));
+ true, BuildProxyList("quic://www.foo.com:443", "http://www.bar.com:80"));
CheckProxyConfig(net::ProxyConfig::ProxyRules::TYPE_PROXY_PER_SCHEME,
- "PROXY www.bar.com:80;DIRECT", std::string(), std::string());
+ "PROXY www.bar.com:80;DIRECT", std::string());
}
TEST_F(DataReductionProxyConfiguratorTest, TestDisable) {
- config_->Enable(
- false, BuildProxyList("https://www.foo.com:443", "http://www.bar.com:80"),
- BuildProxyList(std::string(), std::string()));
+ config_->Enable(false, BuildProxyList("https://www.foo.com:443",
+ "http://www.bar.com:80"));
config_->Disable();
CheckProxyConfig(net::ProxyConfig::ProxyRules::TYPE_NO_RULES, std::string(),
- std::string(), std::string());
+ std::string());
}
TEST_F(DataReductionProxyConfiguratorTest, TestBypassList) {
« no previous file with comments | « components/data_reduction_proxy/core/browser/data_reduction_proxy_configurator_test_utils.cc ('k') | components/data_reduction_proxy/core/browser/data_reduction_proxy_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698