chrome/browser/prefs/pref_service_unittest.cc - Issue 6002015: Policy: generate boilerplate policy type and constant code.

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/prefs/pref_service_unittest.cc

Issue 6002015: Policy: generate boilerplate policy type and constant code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix build Created 10 years 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/app/policy/policy_templates.json ('K') | « chrome/browser/policy/configuration_policy_store_interface.h ('k') | chrome/chrome.gyp » ('j') | chrome/tools/build/generate_policy_source.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/prefs/pref_service_unittest.cc

diff --git a/chrome/browser/prefs/pref_service_unittest.cc b/chrome/browser/prefs/pref_service_unittest.cc

index 1a797083b147e6a9e4a105ce8702f96ef78b8ba6..ec48bdcbf64fab4ac06e5e8261a1f93cdd45aad0 100644

--- a/chrome/browser/prefs/pref_service_unittest.cc

+++ b/chrome/browser/prefs/pref_service_unittest.cc

@@ -156,7 +156,7 @@ TEST(PrefServiceTest, ProxyPolicyOverridesCommandLineOptions) {

new policy::MockConfigurationPolicyProvider());

Value* mode_value = Value::CreateIntegerValue(

policy::kPolicyManuallyConfiguredProxyMode);

- provider->AddPolicy(policy::kPolicyProxyMode, mode_value);

+ provider->AddPolicy(policy::kPolicyProxyServerMode, mode_value);

provider->AddPolicy(policy::kPolicyProxyBypassList,

Value::CreateStringValue("abc"));

provider->AddPolicy(policy::kPolicyProxyServer,

@@ -196,7 +196,7 @@ TEST(PrefServiceTest, ProxyPolicyOverridesUnrelatedCommandLineOptions) {

new policy::MockConfigurationPolicyProvider());

Value* mode_value = Value::CreateIntegerValue(

policy::kPolicyAutoDetectProxyMode);

- provider->AddPolicy(policy::kPolicyProxyMode, mode_value);

+ provider->AddPolicy(policy::kPolicyProxyServerMode, mode_value);

// First verify that command-line options are set correctly when

// there is no policy in effect.

@@ -231,7 +231,7 @@ TEST(PrefServiceTest, ProxyPolicyOverridesCommandLineNoProxy) {

new policy::MockConfigurationPolicyProvider());

Value* mode_value = Value::CreateIntegerValue(

policy::kPolicyAutoDetectProxyMode);

- provider->AddPolicy(policy::kPolicyProxyMode, mode_value);

+ provider->AddPolicy(policy::kPolicyProxyServerMode, mode_value);

// First verify that command-line options are set correctly when

// there is no policy in effect.

@@ -265,7 +265,7 @@ TEST(PrefServiceTest, ProxyPolicyOverridesCommandLineAutoDetect) {

new policy::MockConfigurationPolicyProvider());

Value* mode_value = Value::CreateIntegerValue(

policy::kPolicyNoProxyServerMode);

- provider->AddPolicy(policy::kPolicyProxyMode, mode_value);

+ provider->AddPolicy(policy::kPolicyProxyServerMode, mode_value);

// First verify that the auto-detect is set if there is no managed

// PrefStore.