Policy: Add ProxyMode and deprecate ProxyServerMode.

chrome/browser/policy/configuration_policy_store_interface.h

Index: chrome/browser/policy/configuration_policy_store_interface.h
diff --git a/chrome/browser/policy/configuration_policy_store_interface.h b/chrome/browser/policy/configuration_policy_store_interface.h
index b6d1f3b1a66cc197ddab2c01037e2b1f0db7a758..adce0cdcc0a222d201239504c44e696f3577df32 100644
--- a/chrome/browser/policy/configuration_policy_store_interface.h
+++ b/chrome/browser/policy/configuration_policy_store_interface.h
@@ -26,6 +26,7 @@ enum ConfigurationPolicyType {
   kPolicyDefaultSearchProviderEncodings,
   kPolicyDisableSpdy,
   kPolicyProxyMode,
+  kPolicyProxyServerMode,
   kPolicyProxyServer,
   kPolicyProxyPacUrl,
   kPolicyProxyBypassList,
@@ -79,11 +80,11 @@ enum PolicyProxyModeType {
   // Disable Proxy, connect directly.
   kPolicyNoProxyServerMode = 0,
   // Auto detect proxy or use specific PAC script if given.
-  kPolicyAutoDetectProxyMode = 1,
+  kPolicyAutoDetectProxyServerMode = 1,
   // Use manually configured proxy servers (fixed servers).
-  kPolicyManuallyConfiguredProxyMode = 2,
+  kPolicyManuallyConfiguredProxyServerMode = 2,
   // Use system proxy server.
-  kPolicyUseSystemProxyMode = 3,
+  kPolicyUseSystemProxyServerMode = 3,
 
   MODE_COUNT
 };