components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_unittest.cc - Issue 1132083004: Enable an option to only use the secure Data Reduction Proxy when the secure proxy check succeeds.

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/core/browser/data_reduction_proxy_settings_unittest.cc

Issue 1132083004: Enable an option to only use the secure Data Reduction Proxy when the secure proxy check succeeds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_unittest.cc

diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_unittest.cc

index b169f30af99e6252ab62df2e31d2d2244d5583cc..ee474d581b76886ab9671fb8c9be229a86e96ee9 100644

--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_unittest.cc

+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_unittest.cc

@@ -36,7 +36,7 @@ class DataReductionProxySettingsTest

test_context_->pref_service()->SetBoolean(prefs::kDataReductionProxyEnabled,

initially_enabled);

test_context_->config()->SetStateForTest(initially_enabled, false,

- !request_succeeded);

+ request_succeeded);

ExpectSetProxyPrefs(expected_enabled, false, false);

settings_->MaybeActivateDataReductionProxy(false);

test_context_->RunUntilIdle();

@@ -46,7 +46,7 @@ class DataReductionProxySettingsTest

TEST_F(DataReductionProxySettingsTest, TestIsProxyEnabledOrManaged) {

settings_->InitPrefMembers();

// The proxy is disabled initially.

- test_context_->config()->SetStateForTest(false, false, false);

+ test_context_->config()->SetStateForTest(false, false, true);

EXPECT_FALSE(settings_->IsDataReductionProxyEnabled());

EXPECT_FALSE(settings_->IsDataReductionProxyManaged());

@@ -65,7 +65,7 @@ TEST_F(DataReductionProxySettingsTest, TestIsProxyEnabledOrManaged) {

TEST_F(DataReductionProxySettingsTest, TestCanUseDataReductionProxy) {

settings_->InitPrefMembers();

// The proxy is disabled initially.

- test_context_->config()->SetStateForTest(false, false, false);

+ test_context_->config()->SetStateForTest(false, false, true);

GURL http_gurl("http://url.com/");

EXPECT_FALSE(settings_->CanUseDataReductionProxy(http_gurl));

@@ -219,7 +219,7 @@ TEST(DataReductionProxySettingsStandaloneTest, TestOnProxyEnabledPrefChange) {

.Build();

// The proxy is enabled initially.

- drp_test_context->config()->SetStateForTest(true, false, false);

+ drp_test_context->config()->SetStateForTest(true, false, true);

drp_test_context->InitSettings();

MockDataReductionProxyService* mock_service =