Removed ConfigurationPolicyType and extended PolicyMap.

chrome/browser/policy/configuration_policy_pref_store.h

Index: chrome/browser/policy/configuration_policy_pref_store.h
diff --git a/chrome/browser/policy/configuration_policy_pref_store.h b/chrome/browser/policy/configuration_policy_pref_store.h
index eafed6c6f465f056a7b974a931dd90302994b958..237e2ac8bee084f0fd881fb9edfd82472e59c256 100644
--- a/chrome/browser/policy/configuration_policy_pref_store.h
+++ b/chrome/browser/policy/configuration_policy_pref_store.h
@@ -17,24 +17,6 @@ class PrefValueMap;
 
 namespace policy {
 
-// Constants for the "Proxy Server Mode" defined in the policies.
-// Note that these diverge from internal presentation defined in
-// ProxyPrefs::ProxyMode for legacy reasons. The following four
-// PolicyProxyModeType types were not very precise and had overlapping use
-// cases.
-enum PolicyProxyModeType {
-  // Disable Proxy, connect directly.
-  kPolicyNoProxyServerMode = 0,
-  // Auto detect proxy or use specific PAC script if given.
-  kPolicyAutoDetectProxyServerMode = 1,
-  // Use manually configured proxy servers (fixed servers).
-  kPolicyManuallyConfiguredProxyServerMode = 2,
-  // Use system proxy server.
-  kPolicyUseSystemProxyServerMode = 3,
-
-  MODE_COUNT
-};
-
 // An implementation of PrefStore that bridges policy settings as read from a
 // ConfigurationPolicyProvider to preferences.
 class ConfigurationPolicyPrefStore