chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc - Issue 388663002: Added data reduction proxy holdback experiment

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 388663002: Added data reduction proxy holdback experiment (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 6 years, 5 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/spdyproxy/data_reduction_proxy_settings_factory_android.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 1903e0f030da847ef0ea363a15218a14d3b8b8e7..be4425fbf31397b223a1a97deea40052621b52de 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

@@ -26,7 +26,11 @@ const char kDataReductionProxyDev[] = "http://foo-dev.com:80";

template <class C>

void data_reduction_proxy::DataReductionProxySettingsTestBase::ResetSettings(

- bool allowed, bool fallback_allowed, bool alt_allowed, bool promo_allowed) {

+ bool allowed,

+ bool fallback_allowed,

+ bool alt_allowed,

+ bool promo_allowed,

+ bool holdback) {

int flags = 0;

if (allowed)

flags |= DataReductionProxyParams::kAllowed;

@@ -36,6 +40,8 @@ void data_reduction_proxy::DataReductionProxySettingsTestBase::ResetSettings(

flags |= DataReductionProxyParams::kAlternativeAllowed;

if (promo_allowed)

flags |= DataReductionProxyParams::kPromoAllowed;

+ if (holdback)

+ flags |= DataReductionProxyParams::kHoldback;

MockDataReductionProxySettings<C>* settings =

new MockDataReductionProxySettings<C>(flags);

EXPECT_CALL(*settings, GetOriginalProfilePrefs())

@@ -81,7 +87,8 @@ data_reduction_proxy::DataReductionProxySettingsTestBase::ResetSettings<

DataReductionProxySettingsAndroid>(bool allowed,

bool fallback_allowed,

bool alt_allowed,

- bool promo_allowed);

+ bool promo_allowed,

+ bool holdback);

template void

data_reduction_proxy::DataReductionProxySettingsTestBase::SetProbeResult<

@@ -125,7 +132,7 @@ TEST_F(DataReductionProxySettingsAndroidTest,

CommandLine::ForCurrentProcess()->AppendSwitchASCII(

data_reduction_proxy::switches::kDataReductionProxyDev,

kDataReductionProxyDev);

- ResetSettings(true, true, false, true);

+ ResetSettings(true, true, false, true, false);

ScopedJavaLocalRef<jstring> result =

Settings()->GetDataReductionProxyOrigin(env_, NULL);

ASSERT_TRUE(result.obj());