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 8ed89341a1f39e8c27aff5f176c8056395bcd6f7..e476c75ed0b43842c270877f2f0573bb180b0ada 100644
--- a/chrome/common/policy_constants.cc
+++ b/chrome/common/policy_constants.cc
@@ -32,10 +32,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";