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

Unified Diff: components/data_reduction_proxy/browser/data_reduction_proxy_settings_unittest.cc

Issue 548993002: Removed connection warmup logic from data reduction proxy (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 3 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/browser/data_reduction_proxy_settings_test_utils.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/data_reduction_proxy/browser/data_reduction_proxy_settings_unittest.cc
diff --git a/components/data_reduction_proxy/browser/data_reduction_proxy_settings_unittest.cc b/components/data_reduction_proxy/browser/data_reduction_proxy_settings_unittest.cc
index 9993ba38360e3057c6750e812bd89384c54ffa8e..d40cadccb9521d4f4670db58db7aa071d24206d2 100644
--- a/components/data_reduction_proxy/browser/data_reduction_proxy_settings_unittest.cc
+++ b/components/data_reduction_proxy/browser/data_reduction_proxy_settings_unittest.cc
@@ -23,7 +23,6 @@ namespace {
const char kProbeURLWithOKResponse[] = "http://ok.org/";
const char kProbeURLWithBadResponse[] = "http://bad.org/";
const char kProbeURLWithNoResponse[] = "http://no.org/";
-const char kWarmupURLWithNoContentResponse[] = "http://warm.org/";
} // namespace
@@ -240,7 +239,6 @@ TEST_F(DataReductionProxySettingsTest, TestMaybeActivateDataReductionProxy) {
// Request succeeded but with bad response, expect proxy to be restricted.
CheckProbe(true,
kProbeURLWithBadResponse,
- kWarmupURLWithNoContentResponse,
"Bad",
true,
true,
@@ -249,7 +247,6 @@ TEST_F(DataReductionProxySettingsTest, TestMaybeActivateDataReductionProxy) {
// Request succeeded with valid response, expect proxy to be unrestricted.
CheckProbe(true,
kProbeURLWithOKResponse,
- kWarmupURLWithNoContentResponse,
"OK",
true,
true,
@@ -258,7 +255,6 @@ TEST_F(DataReductionProxySettingsTest, TestMaybeActivateDataReductionProxy) {
// Request failed, expect proxy to be enabled but restricted.
CheckProbe(true,
kProbeURLWithNoResponse,
- kWarmupURLWithNoContentResponse,
"",
false,
true,
@@ -268,7 +264,6 @@ TEST_F(DataReductionProxySettingsTest, TestMaybeActivateDataReductionProxy) {
// state.
CheckProbe(false,
kProbeURLWithOKResponse,
- kWarmupURLWithNoContentResponse,
"OK",
true,
false,
@@ -292,28 +287,24 @@ TEST_F(DataReductionProxySettingsTest, TestOnIPAddressChanged) {
// IP address change triggers a probe that succeeds. Proxy remains
// unrestricted.
CheckProbeOnIPChange(kProbeURLWithOKResponse,
- kWarmupURLWithNoContentResponse,
"OK",
true,
false,
false);
// IP address change triggers a probe that fails. Proxy is restricted.
CheckProbeOnIPChange(kProbeURLWithBadResponse,
- kWarmupURLWithNoContentResponse,
"Bad",
true,
true,
false);
// IP address change triggers a probe that fails. Proxy remains restricted.
CheckProbeOnIPChange(kProbeURLWithBadResponse,
- kWarmupURLWithNoContentResponse,
"Bad",
true,
true,
false);
// IP address change triggers a probe that succeeds. Proxy is unrestricted.
CheckProbeOnIPChange(kProbeURLWithOKResponse,
- kWarmupURLWithNoContentResponse,
"OK",
true,
false,
@@ -344,7 +335,6 @@ TEST_F(DataReductionProxySettingsTest, TestOnIPAddressChanged) {
0 /* network prefix */
));
CheckProbeOnIPChange(kProbeURLWithOKResponse,
- kWarmupURLWithNoContentResponse,
"OK",
true,
false,
« no previous file with comments | « components/data_reduction_proxy/browser/data_reduction_proxy_settings_test_utils.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698