chrome/browser/prefs/pref_service_unittest.cc - Issue 5958014: Policy: Add ProxyMode and deprecate ProxyServerMode.

Unified Diff: chrome/browser/prefs/pref_service_unittest.cc

Issue 5958014: Policy: Add ProxyMode and deprecate ProxyServerMode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: small tweaks 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/browser/policy/configuration_policy_pref_store.cc ('K') | « chrome/browser/policy/configuration_policy_store_interface.h ('k') | chrome/browser/prefs/proxy_prefs.h » ('j') | tools/grit/grit/format/policy_templates/policy_template_generator.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..3c60ad09f3f0599ecbeac8c95efdc05601941694 100644

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

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

@@ -155,8 +155,8 @@ TEST(PrefServiceTest, ProxyPolicyOverridesCommandLineOptions) {

scoped_ptr<policy::MockConfigurationPolicyProvider> provider(

new policy::MockConfigurationPolicyProvider());

Value* mode_value = Value::CreateIntegerValue(

- policy::kPolicyManuallyConfiguredProxyMode);

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

+ policy::kPolicyManuallyConfiguredProxyServerMode);

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

battre 2011/01/03 13:19:16 given that kPolicyProxyServerMode is deprecated, i

danno 2011/01/07 12:24:25 Done.

provider->AddPolicy(policy::kPolicyProxyBypassList,

Value::CreateStringValue("abc"));

provider->AddPolicy(policy::kPolicyProxyServer,

@@ -195,8 +195,8 @@ TEST(PrefServiceTest, ProxyPolicyOverridesUnrelatedCommandLineOptions) {

scoped_ptr<policy::MockConfigurationPolicyProvider> provider(

new policy::MockConfigurationPolicyProvider());

Value* mode_value = Value::CreateIntegerValue(

- policy::kPolicyAutoDetectProxyMode);

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

+ policy::kPolicyAutoDetectProxyServerMode);

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

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

// there is no policy in effect.

@@ -230,8 +230,8 @@ TEST(PrefServiceTest, ProxyPolicyOverridesCommandLineNoProxy) {

scoped_ptr<policy::MockConfigurationPolicyProvider> provider(

new policy::MockConfigurationPolicyProvider());

Value* mode_value = Value::CreateIntegerValue(

- policy::kPolicyAutoDetectProxyMode);

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

+ policy::kPolicyAutoDetectProxyServerMode);

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