components/data_reduction_proxy/browser/data_reduction_proxy_settings_test_utils.h - Issue 548993002: Removed connection warmup logic from 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: components/data_reduction_proxy/browser/data_reduction_proxy_settings_test_utils.h

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.cc ('k') | components/data_reduction_proxy/browser/data_reduction_proxy_settings_test_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/data_reduction_proxy/browser/data_reduction_proxy_settings_test_utils.h

diff --git a/components/data_reduction_proxy/browser/data_reduction_proxy_settings_test_utils.h b/components/data_reduction_proxy/browser/data_reduction_proxy_settings_test_utils.h

index f535e2e5651000ccc25bb39f601ed99bd5c60f4e..087a783017f9c2e2852298803c8d3a72187556fb 100644

--- a/components/data_reduction_proxy/browser/data_reduction_proxy_settings_test_utils.h

+++ b/components/data_reduction_proxy/browser/data_reduction_proxy_settings_test_utils.h

@@ -71,7 +71,6 @@ class MockDataReductionProxySettings : public C {

~TestDataReductionProxyParams::HAS_DEV_ORIGIN &

~TestDataReductionProxyParams::HAS_DEV_FALLBACK_ORIGIN)) {}

MOCK_METHOD0(GetURLFetcherForAvailabilityCheck, net::URLFetcher*());

- MOCK_METHOD0(GetURLFetcherForWarmup, net::URLFetcher*());

MOCK_METHOD0(GetOriginalProfilePrefs, PrefService*());

MOCK_METHOD0(GetLocalStatePrefs, PrefService*());

MOCK_METHOD3(LogProxyState, void(

@@ -128,13 +127,11 @@ class DataReductionProxySettingsTestBase : public testing::Test {

template <class C> void SetProbeResult(

const std::string& test_url,

- const std::string& warmup_test_url,

const std::string& response,

ProbeURLFetchResult state,

bool success,

int expected_calls);

virtual void SetProbeResult(const std::string& test_url,

- const std::string& warmup_test_url,

const std::string& response,

ProbeURLFetchResult result,

bool success,

@@ -145,14 +142,12 @@ class DataReductionProxySettingsTestBase : public testing::Test {

bool expected_fallback_restricted);

void CheckProbe(bool initially_enabled,

const std::string& probe_url,

- const std::string& warmup_url,

const std::string& response,

bool request_success,

bool expected_enabled,

bool expected_restricted,

bool expected_fallback_restricted);

void CheckProbeOnIPChange(const std::string& probe_url,

- const std::string& warmup_url,

const std::string& response,

bool request_success,

bool expected_enabled,

@@ -189,14 +184,12 @@ class ConcreteDataReductionProxySettingsTest

}

virtual void SetProbeResult(const std::string& test_url,

- const std::string& warmup_test_url,

const std::string& response,

ProbeURLFetchResult result,

bool success,

int expected_calls) OVERRIDE {

return DataReductionProxySettingsTestBase::SetProbeResult<C>(

test_url,

- warmup_test_url,

response,

result,

success,