Upstream version 10.38.208.0

[platform/framework/web/crosswalk.git] / src / components / data_reduction_proxy / browser / data_reduction_proxy_settings_unittest.cc

diff --git a/src/components/data_reduction_proxy/browser/data_reduction_proxy_settings_unittest.cc b/src/components/data_reduction_proxy/browser/data_reduction_proxy_settings_unittest.cc
index 9e77071..a192d9a 100644 (file)
--- a/src/components/data_reduction_proxy/browser/data_reduction_proxy_settings_unittest.cc
+++ b/src/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
 
@@ -239,7 +238,6 @@ TEST_F(DataReductionProxySettingsTest, TestMaybeActivateDataReductionProxy) {
   // Request succeeded but with bad response, expect proxy to be restricted.
   CheckProbe(true,
              kProbeURLWithBadResponse,
-             kWarmupURLWithNoContentResponse,
              "Bad",
              true,
              true,
@@ -248,7 +246,6 @@ TEST_F(DataReductionProxySettingsTest, TestMaybeActivateDataReductionProxy) {
   // Request succeeded with valid response, expect proxy to be unrestricted.
   CheckProbe(true,
              kProbeURLWithOKResponse,
-             kWarmupURLWithNoContentResponse,
              "OK",
              true,
              true,
@@ -257,7 +254,6 @@ TEST_F(DataReductionProxySettingsTest, TestMaybeActivateDataReductionProxy) {
   // Request failed, expect proxy to be enabled but restricted.
   CheckProbe(true,
              kProbeURLWithNoResponse,
-             kWarmupURLWithNoContentResponse,
              "",
              false,
              true,
@@ -267,7 +263,6 @@ TEST_F(DataReductionProxySettingsTest, TestMaybeActivateDataReductionProxy) {
   // state.
   CheckProbe(false,
              kProbeURLWithOKResponse,
-             kWarmupURLWithNoContentResponse,
              "OK",
              true,
              false,
@@ -291,28 +286,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,
@@ -343,7 +334,6 @@ TEST_F(DataReductionProxySettingsTest, TestOnIPAddressChanged) {
                             0  /* network prefix */
                             ));
   CheckProbeOnIPChange(kProbeURLWithOKResponse,
-                       kWarmupURLWithNoContentResponse,
                        "OK",
                        true,
                        false,