Removed ConfigurationPolicyType and extended PolicyMap.

chrome/browser/policy/cloud_policy_provider_impl.cc

Index: chrome/browser/policy/cloud_policy_provider_impl.cc
diff --git a/chrome/browser/policy/cloud_policy_provider_impl.cc b/chrome/browser/policy/cloud_policy_provider_impl.cc
index 4e30e45032a403a0e739f60bc910df0abd5e8075..97ce59584fd10a95544aa0102eb5cd94ef676c1b 100644
--- a/chrome/browser/policy/cloud_policy_provider_impl.cc
+++ b/chrome/browser/policy/cloud_policy_provider_impl.cc
@@ -14,7 +14,7 @@ namespace policy {
 CloudPolicyProviderImpl::CloudPolicyProviderImpl(
     BrowserPolicyConnector* browser_policy_connector,
     const PolicyDefinitionList* policy_list,
-    CloudPolicyCacheBase::PolicyLevel level)
+    PolicyLevel level)
     : CloudPolicyProvider(policy_list),
       browser_policy_connector_(browser_policy_connector),
       level_(level),
@@ -89,13 +89,15 @@ void CloudPolicyProviderImpl::RecombineCachesAndTriggerUpdate() {
   for (ListType::iterator i = caches_.begin(); i != caches_.end(); ++i) {
     if (!(*i)->IsReady())
       continue;
-    cache_policies.CopyFrom(*(*i)->policy(level_));
+    cache_policies.CopyFrom(*(*i)->policy());
     FixDeprecatedPolicies(&cache_policies);
     newly_combined.MergeFrom(cache_policies);
   }
 
-  // Trigger a notification.
   combined_.Swap(&newly_combined);
+  combined_.FilterLevel(level_);

[Mattias Nissler (ping if slow), 2012/01/16 18:23:33]

shouldn't that rather be FilterLevel first and then Swap? Doesn't really make a
difference here, but the idea of the swap in the first place is to construct the
fully-built replacement first before swapping.

[Joao da Silva, 2012/01/17 13:09:29]

Done.

+
+  // Trigger a notification.
   if (pending_update_caches_.empty())
     NotifyPolicyUpdated();
 }