Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4508)

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: check final diff Created 9 years, 11 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/policy/configuration_policy_store_interface.h ('k') | chrome/browser/prefs/proxy_prefs.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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..3ead5022a4c35b5f8a205bfdcae0256d4947bbaf 100644
--- a/chrome/browser/prefs/pref_service_unittest.cc
+++ b/chrome/browser/prefs/pref_service_unittest.cc
@@ -154,9 +154,9 @@ TEST(PrefServiceTest, ProxyPolicyOverridesCommandLineOptions) {
command_line.AppendSwitchASCII(switches::kProxyServer, "789");
scoped_ptr<policy::MockConfigurationPolicyProvider> provider(
new policy::MockConfigurationPolicyProvider());
- Value* mode_value = Value::CreateIntegerValue(
- policy::kPolicyManuallyConfiguredProxyMode);
- provider->AddPolicy(policy::kPolicyProxyMode, mode_value);
+ Value* mode_name = Value::CreateStringValue(
+ ProxyPrefs::kFixedServersProxyModeName);
+ provider->AddPolicy(policy::kPolicyProxyMode, mode_name);
provider->AddPolicy(policy::kPolicyProxyBypassList,
Value::CreateStringValue("abc"));
provider->AddPolicy(policy::kPolicyProxyServer,
@@ -194,9 +194,9 @@ TEST(PrefServiceTest, ProxyPolicyOverridesUnrelatedCommandLineOptions) {
command_line.AppendSwitchASCII(switches::kProxyServer, "789");
scoped_ptr<policy::MockConfigurationPolicyProvider> provider(
new policy::MockConfigurationPolicyProvider());
- Value* mode_value = Value::CreateIntegerValue(
- policy::kPolicyAutoDetectProxyMode);
- provider->AddPolicy(policy::kPolicyProxyMode, mode_value);
+ Value* mode_name = Value::CreateStringValue(
+ ProxyPrefs::kAutoDetectProxyModeName);
+ provider->AddPolicy(policy::kPolicyProxyMode, mode_name);
// First verify that command-line options are set correctly when
// there is no policy in effect.
@@ -229,9 +229,9 @@ TEST(PrefServiceTest, ProxyPolicyOverridesCommandLineNoProxy) {
command_line.AppendSwitch(switches::kNoProxyServer);
scoped_ptr<policy::MockConfigurationPolicyProvider> provider(
new policy::MockConfigurationPolicyProvider());
- Value* mode_value = Value::CreateIntegerValue(
- policy::kPolicyAutoDetectProxyMode);
- provider->AddPolicy(policy::kPolicyProxyMode, mode_value);
+ Value* mode_name = Value::CreateStringValue(
+ ProxyPrefs::kAutoDetectProxyModeName);
+ provider->AddPolicy(policy::kPolicyProxyMode, mode_name);
// First verify that command-line options are set correctly when
// there is no policy in effect.
@@ -263,9 +263,9 @@ TEST(PrefServiceTest, ProxyPolicyOverridesCommandLineAutoDetect) {
command_line.AppendSwitch(switches::kProxyAutoDetect);
scoped_ptr<policy::MockConfigurationPolicyProvider> provider(
new policy::MockConfigurationPolicyProvider());
- Value* mode_value = Value::CreateIntegerValue(
- policy::kPolicyNoProxyServerMode);
- provider->AddPolicy(policy::kPolicyProxyMode, mode_value);
+ Value* mode_name = Value::CreateStringValue(
+ ProxyPrefs::kDirectProxyModeName);
+ provider->AddPolicy(policy::kPolicyProxyMode, mode_name);
// First verify that the auto-detect is set if there is no managed
// PrefStore.
« no previous file with comments | « chrome/browser/policy/configuration_policy_store_interface.h ('k') | chrome/browser/prefs/proxy_prefs.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698