Removed ConfigurationPolicyType and extended PolicyMap.

chrome/browser/policy/configuration_policy_provider.h

Index: chrome/browser/policy/configuration_policy_provider.h
diff --git a/chrome/browser/policy/configuration_policy_provider.h b/chrome/browser/policy/configuration_policy_provider.h
index ef72e6bb7c2d2dbadd6d8112772f82e34ab1139c..6d5d7d568ebc5fedfc6a75584214eaca4e609a14 100644
--- a/chrome/browser/policy/configuration_policy_provider.h
+++ b/chrome/browser/policy/configuration_policy_provider.h
@@ -13,7 +13,6 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/values.h"
-#include "policy/configuration_policy_type.h"
 
 namespace policy {
 
@@ -61,6 +60,11 @@ class ConfigurationPolicyProvider {
   // OnUpdatePolicy won't be called if that happens.
   virtual void RefreshPolicies() = 0;
 
+  // Utility method that converts deprecated policies into their corresponding
+  // actual policies. Subclasses can use this to fix deprecated policies in
+  // PolicyMaps that they obtained from elsewhere.
+  static void FixDeprecatedPolicies(PolicyMap* policies);
+
  protected:
   // Sends a policy update notification to observers.
   void NotifyPolicyUpdated();
@@ -70,11 +74,6 @@ class ConfigurationPolicyProvider {
   // |OverridePolicies|.
   virtual bool ProvideInternal(PolicyMap* result) = 0;
 
-  // Utility method that converts deprecated policies into their corresponding
-  // actual policies. Subclasses can use this to fix deprecated policies in
-  // PolicyMaps that they obtained from elsewhere.
-  static void FixDeprecatedPolicies(PolicyMap* policies);
-
   const PolicyDefinitionList* policy_definition_list() const {
     return policy_definition_list_;
   }