Introduce a separate preference for 'proxy server mode'

chrome/common/pref_names.cc

Index: chrome/common/pref_names.cc
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index 11a25fcc32d3d9d7fa9e186c7cc4a6897f6d7bee..1e44760d1046ab9f22b0e809c71eb7f7c923cb51 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -1124,11 +1124,10 @@ const char kCloudPrintPrintSystemSettings[] =
 // Used by the service process to determine if the remoting host is enabled.
 const char kRemotingHostEnabled[] = "remoting.host_enabled";
 
-// Boolean to disable proxy altogether. If true, other proxy
-// preferences are ignored.
-const char kNoProxyServer[] = "proxy.disabled";
-// Boolean specifying if proxy should be auto-detected.
-const char kProxyAutoDetect[] = "proxy.auto_detect";
+// Integer to specify the type of proxy settings.
+// See ProxyPrefs for possible values and interactions with the other proxy
+// preferences.
+const char kProxyMode[] = "proxy.mode";

[Mattias Nissler (ping if slow), 2010/12/21 15:54:29]

Do we need conversion code for migrating legacy prefs?

[battre (please use the other), 2010/12/21 20:14:09]

We have this code in configuration_policy_pref_store.cc. There is no simple 1:1
mapping. The new format is not yet supported by policies. "proxy.mode" is only
used in the user preferences file and in extension pref stores.

[Mattias Nissler (ping if slow), 2010/12/22 10:22:11]

What I meant is whether we need to care about possible existing Preferences
files that users may have. If somebody has set up their proxy by putting
appropriate configuration in the prefs file, we break them. The question is
whether that's acceptable or not, in which case we need to provide migration
code.

[battre, 2010/12/22 14:41:16]

If a user has set no kProxyMode constant because it was not introduced before,
Chrome falls back to system proxy prefs (registered default). I think this is
reasonable, given that this feature has not seen much exposure, yet.

 // String specifying the proxy server. For a specification of the expected
 // syntax see net::ProxyConfig::ProxyRules::ParseFromString().
 const char kProxyServer[] = "proxy.server";