components/data_reduction_proxy/browser/data_reduction_proxy_settings_test_utils.h - Issue 549153003: Dev finch trial of the data reduction proxy overrides both the primary and the fallback hosts

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 549153003: Dev finch trial of the data reduction proxy overrides both the primary and the fallback hosts (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: addressed comments. 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_protocol_unittest.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 eb8ef0ee48e0a8390b9ea2ad87cb8655e3a68ef8..f535e2e5651000ccc25bb39f601ed99bd5c60f4e 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

@@ -63,11 +63,13 @@ class MockDataReductionProxySettings : public C {

DataReductionProxyParams::kFallbackAllowed |

DataReductionProxyParams::kPromoAllowed,

TestDataReductionProxyParams::HAS_EVERYTHING &

- ~TestDataReductionProxyParams::HAS_DEV_ORIGIN)) {}

+ ~TestDataReductionProxyParams::HAS_DEV_ORIGIN &

+ ~TestDataReductionProxyParams::HAS_DEV_FALLBACK_ORIGIN)) {}

MockDataReductionProxySettings<C>(int flags)

: C(new TestDataReductionProxyParams(flags,

TestDataReductionProxyParams::HAS_EVERYTHING &

- ~TestDataReductionProxyParams::HAS_DEV_ORIGIN)) {}

+ ~TestDataReductionProxyParams::HAS_DEV_ORIGIN &

+ ~TestDataReductionProxyParams::HAS_DEV_FALLBACK_ORIGIN)) {}

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

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

MOCK_METHOD0(GetOriginalProfilePrefs, PrefService*());