Policy: Add ProxyMode and deprecate ProxyServerMode.

chrome/common/policy_constants.cc

Index: chrome/common/policy_constants.cc
diff --git a/chrome/common/policy_constants.cc b/chrome/common/policy_constants.cc
index 848b28bde0aa15e54d718a5952389e5614603efa..032c07ae5e63c03db963b0c6d4df3665e79770b1 100644
--- a/chrome/common/policy_constants.cc
+++ b/chrome/common/policy_constants.cc
@@ -34,10 +34,9 @@ const char kDefaultSearchProviderIconURL[] =
 const char kDefaultSearchProviderEncodings[] =
     "DefaultSearchProviderEncodings";
 const char kDisableSpdy[] = "DisableSpdy";
-// We consider the name ProxyMode more apt than ProxyServerMode but could
-// not change it after publishing that name for the win registry and policy
-// config files.
-const char kProxyMode[] = "ProxyServerMode";
+const char kProxyMode[] = "ProxyMode";
+// Deprecated name of policy to set proxy server mode
+const char kProxyServerMode[] = "ProxyServerMode";
 const char kProxyServer[] = "ProxyServer";
 const char kProxyPacUrl[] = "ProxyPacUrl";
 const char kProxyBypassList[] = "ProxyBypassList";