components/data_reduction_proxy/browser/data_reduction_proxy_settings_test_utils.cc - Issue 449973002: Use data reduction proxy when managed proxy config returns direct

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.cc

Issue 449973002: Use data reduction proxy when managed proxy config returns direct (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@no-uma-in-proxy-service

Patch Set: Addressed comment and nit Created 6 years, 4 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

« chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.cc ('K') | « components/data_reduction_proxy/browser/data_reduction_proxy_settings_test_utils.h ('k') | components/data_reduction_proxy/browser/data_reduction_proxy_settings_unittest.cc » ('j') | net/base/network_delegate.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 ccd3c2dd2b4211d804a2e2053456120998a8b854..7cf609a139d3d4a123d0900208a2c563bde4c266 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

@@ -146,7 +146,8 @@ void DataReductionProxySettingsTestBase::ResetSettings(bool allowed,

EXPECT_CALL(*settings, GetURLFetcherForWarmup()).Times(0);

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

settings_.reset(settings);

- settings_->configurator_.reset(new TestDataReductionProxyConfig());

+ configurator_.reset(new TestDataReductionProxyConfig());

+ settings_->configurator_ = configurator_.get();

}

// Explicitly generate required instantiations.

@@ -210,8 +211,7 @@ void DataReductionProxySettingsTestBase::CheckProxyConfigs(

bool expected_restricted,

bool expected_fallback_restricted) {

TestDataReductionProxyConfig* config =

- static_cast<TestDataReductionProxyConfig*>(

- settings_->configurator_.get());

+ static_cast<TestDataReductionProxyConfig*>(settings_->configurator_);

ASSERT_EQ(expected_restricted, config->restricted_);

ASSERT_EQ(expected_fallback_restricted, config->fallback_restricted_);

ASSERT_EQ(expected_enabled, config->enabled_);

@@ -297,7 +297,7 @@ void DataReductionProxySettingsTestBase::CheckInitDataReductionProxy(

enabled_at_startup ? 1 : 0);

scoped_ptr<DataReductionProxyConfigurator> configurator(

new TestDataReductionProxyConfig());

- settings_->SetProxyConfigurator(configurator.Pass());

+ settings_->SetProxyConfigurator(configurator.get());

scoped_refptr<net::TestURLRequestContextGetter> request_context =

new net::TestURLRequestContextGetter(base::MessageLoopProxy::current());