| Index: components/data_reduction_proxy/browser/data_reduction_proxy_settings_test_utils.cc
|
| diff --git a/components/data_reduction_proxy/browser/data_reduction_proxy_settings_test_utils.cc b/components/data_reduction_proxy/browser/data_reduction_proxy_settings_test_utils.cc
|
| index fb972faba98f05573a34d891bd250d218b2a332f..ad2433813e76cae58db070b07439d0cd96305745 100644
|
| --- a/components/data_reduction_proxy/browser/data_reduction_proxy_settings_test_utils.cc
|
| +++ b/components/data_reduction_proxy/browser/data_reduction_proxy_settings_test_utils.cc
|
| @@ -20,7 +20,6 @@ using testing::Return;
|
| namespace {
|
|
|
| const char kProbeURLWithOKResponse[] = "http://ok.org/";
|
| -const char kWarmupURLWithNoContentResponse[] = "http://warm.org/";
|
|
|
| const char kProxy[] = "proxy";
|
|
|
| @@ -144,7 +143,6 @@ void DataReductionProxySettingsTestBase::ResetSettings(bool allowed,
|
| .Times(AnyNumber())
|
| .WillRepeatedly(Return(&pref_service_));
|
| EXPECT_CALL(*settings, GetURLFetcherForAvailabilityCheck()).Times(0);
|
| - EXPECT_CALL(*settings, GetURLFetcherForWarmup()).Times(0);
|
| EXPECT_CALL(*settings, LogProxyState(_, _, _)).Times(0);
|
| settings_.reset(settings);
|
| configurator_.reset(new TestDataReductionProxyConfig());
|
| @@ -163,7 +161,6 @@ DataReductionProxySettingsTestBase::ResetSettings<DataReductionProxySettings>(
|
| template <class C>
|
| void DataReductionProxySettingsTestBase::SetProbeResult(
|
| const std::string& test_url,
|
| - const std::string& warmup_test_url,
|
| const std::string& response,
|
| ProbeURLFetchResult result,
|
| bool success,
|
| @@ -172,7 +169,6 @@ void DataReductionProxySettingsTestBase::SetProbeResult(
|
| static_cast<MockDataReductionProxySettings<C>*>(settings_.get());
|
| if (0 == expected_calls) {
|
| EXPECT_CALL(*settings, GetURLFetcherForAvailabilityCheck()).Times(0);
|
| - EXPECT_CALL(*settings, GetURLFetcherForWarmup()).Times(0);
|
| EXPECT_CALL(*settings, RecordProbeURLFetchResult(_)).Times(0);
|
| } else {
|
| EXPECT_CALL(*settings, RecordProbeURLFetchResult(result)).Times(1);
|
| @@ -185,15 +181,6 @@ void DataReductionProxySettingsTestBase::SetProbeResult(
|
| success ? net::HTTP_OK : net::HTTP_INTERNAL_SERVER_ERROR,
|
| success ? net::URLRequestStatus::SUCCESS :
|
| net::URLRequestStatus::FAILED)));
|
| - EXPECT_CALL(*settings, GetURLFetcherForWarmup())
|
| - .Times(expected_calls)
|
| - .WillRepeatedly(Return(new net::FakeURLFetcher(
|
| - GURL(warmup_test_url),
|
| - settings,
|
| - "",
|
| - success ? net::HTTP_NO_CONTENT : net::HTTP_INTERNAL_SERVER_ERROR,
|
| - success ? net::URLRequestStatus::SUCCESS :
|
| - net::URLRequestStatus::FAILED)));
|
| }
|
| }
|
|
|
| @@ -201,7 +188,6 @@ void DataReductionProxySettingsTestBase::SetProbeResult(
|
| template void
|
| DataReductionProxySettingsTestBase::SetProbeResult<DataReductionProxySettings>(
|
| const std::string& test_url,
|
| - const std::string& warmup_test_url,
|
| const std::string& response,
|
| ProbeURLFetchResult result,
|
| bool success,
|
| @@ -221,7 +207,6 @@ void DataReductionProxySettingsTestBase::CheckProxyConfigs(
|
| void DataReductionProxySettingsTestBase::CheckProbe(
|
| bool initially_enabled,
|
| const std::string& probe_url,
|
| - const std::string& warmup_url,
|
| const std::string& response,
|
| bool request_succeeded,
|
| bool expected_enabled,
|
| @@ -233,7 +218,6 @@ void DataReductionProxySettingsTestBase::CheckProbe(
|
| settings_->enabled_by_user_ = true;
|
| settings_->restricted_by_carrier_ = false;
|
| SetProbeResult(probe_url,
|
| - warmup_url,
|
| response,
|
| FetchResult(initially_enabled,
|
| request_succeeded && (response == "OK")),
|
| @@ -248,13 +232,11 @@ void DataReductionProxySettingsTestBase::CheckProbe(
|
|
|
| void DataReductionProxySettingsTestBase::CheckProbeOnIPChange(
|
| const std::string& probe_url,
|
| - const std::string& warmup_url,
|
| const std::string& response,
|
| bool request_succeeded,
|
| bool expected_restricted,
|
| bool expected_fallback_restricted) {
|
| SetProbeResult(probe_url,
|
| - warmup_url,
|
| response,
|
| FetchResult(!settings_->restricted_by_carrier_,
|
| request_succeeded && (response == "OK")),
|
| @@ -271,7 +253,6 @@ void DataReductionProxySettingsTestBase::CheckOnPrefChange(
|
| bool managed) {
|
| // Always have a sucessful probe for pref change tests.
|
| SetProbeResult(kProbeURLWithOKResponse,
|
| - kWarmupURLWithNoContentResponse,
|
| "OK",
|
| FetchResult(enabled, true),
|
| true,
|
| @@ -291,7 +272,6 @@ void DataReductionProxySettingsTestBase::CheckInitDataReductionProxy(
|
| bool enabled_at_startup) {
|
| base::MessageLoopForUI loop;
|
| SetProbeResult(kProbeURLWithOKResponse,
|
| - kWarmupURLWithNoContentResponse,
|
| "OK",
|
| FetchResult(enabled_at_startup, true),
|
| true,
|
|
|