Removed ConfigurationPolicyType and extended PolicyMap.

chrome/browser/policy/cloud_policy_provider_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/policy/cloud_policy_provider_impl.h"
 
 #include <algorithm>
 
 #include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/policy/configuration_policy_pref_store.h"
 
 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),
       initialization_complete_(true) {}
 
 CloudPolicyProviderImpl::~CloudPolicyProviderImpl() {
   for (ListType::iterator i = caches_.begin(); i != caches_.end(); ++i)
     (*i)->RemoveObserver(this);
 }
 
@@ skipping 54 matching lines @@
     if (all_caches_ready)
       initialization_complete_ = true;
   }
 
   // Reconstruct the merged policy map.
   PolicyMap newly_combined;
   PolicyMap cache_policies;
   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);
   }
 
+  newly_combined.FilterLevel(level_);
+  combined_.Swap(&newly_combined);
+
   // Trigger a notification.
-  combined_.Swap(&newly_combined);
   if (pending_update_caches_.empty())
     NotifyPolicyUpdated();
 }
 
 // static
 void CloudPolicyProviderImpl::RemoveCache(CloudPolicyCacheBase* cache,
                                           ListType* caches) {
   ListType::iterator it = std::find(caches->begin(), caches->end(), cache);
   if (it != caches->end())
     caches->erase(it);
 }
 
 }  // namespace policy