chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc - Issue 338723002: Add probe to warm data reduction proxy

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc

Issue 338723002: Add probe to warm data reduction proxy (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 6 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 | « chrome/browser/net/chrome_network_delegate.cc ('k') | components/data_reduction_proxy/browser/data_reduction_proxy_params.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc

diff --git a/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc b/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc

index 65d97d9b7b1f128cc28f758259b28230a5c652d1..84ff76d66afcc2168da17bf73c470e53d6b86521 100644

--- a/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc

+++ b/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc

@@ -45,7 +45,7 @@ void data_reduction_proxy::DataReductionProxySettingsTestBase::ResetSettings(

EXPECT_CALL(*settings, GetLocalStatePrefs())

.Times(AnyNumber())

.WillRepeatedly(Return(&pref_service_));

- EXPECT_CALL(*settings, GetURLFetcher()).Times(0);

+ EXPECT_CALL(*settings, GetURLFetcherForAvailabilityCheck()).Times(0);

EXPECT_CALL(*settings, LogProxyState(_, _, _)).Times(0);

settings_.reset(settings);

}

@@ -53,6 +53,7 @@ void data_reduction_proxy::DataReductionProxySettingsTestBase::ResetSettings(

template <class C>

void data_reduction_proxy::DataReductionProxySettingsTestBase::SetProbeResult(

const std::string& test_url,

+ const std::string& warmup_test_url,

const std::string& response,

ProbeURLFetchResult result,

bool success,

@@ -60,11 +61,11 @@ void data_reduction_proxy::DataReductionProxySettingsTestBase::SetProbeResult(

MockDataReductionProxySettings<C>* settings =

static_cast<MockDataReductionProxySettings<C>*>(settings_.get());

if (0 == expected_calls) {

- EXPECT_CALL(*settings, GetURLFetcher()).Times(0);

+ EXPECT_CALL(*settings, GetURLFetcherForAvailabilityCheck()).Times(0);

EXPECT_CALL(*settings, RecordProbeURLFetchResult(_)).Times(0);

} else {

EXPECT_CALL(*settings, RecordProbeURLFetchResult(result)).Times(1);

- EXPECT_CALL(*settings, GetURLFetcher())

+ EXPECT_CALL(*settings, GetURLFetcherForAvailabilityCheck())

.Times(expected_calls)

.WillRepeatedly(Return(new net::FakeURLFetcher(

GURL(test_url),

@@ -86,6 +87,7 @@ data_reduction_proxy::DataReductionProxySettingsTestBase::ResetSettings<

template void

data_reduction_proxy::DataReductionProxySettingsTestBase::SetProbeResult<

DataReductionProxySettingsAndroid>(const std::string& test_url,

+ const std::string& warmup_test_url,

const std::string& response,

ProbeURLFetchResult result,

bool success,