Removed ConfigurationPolicyType and extended PolicyMap.

chrome/browser/policy/asynchronous_policy_provider.cc

Index: chrome/browser/policy/asynchronous_policy_provider.cc
diff --git a/chrome/browser/policy/asynchronous_policy_provider.cc b/chrome/browser/policy/asynchronous_policy_provider.cc
index 06ea9a79979a9ec306dca58dbd4fdce1befd7ecb..89d630f8e061f2c03bef6cd8265b25c038c8a1a8 100644
--- a/chrome/browser/policy/asynchronous_policy_provider.cc
+++ b/chrome/browser/policy/asynchronous_policy_provider.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -6,7 +6,6 @@
 
 #include "base/bind.h"
 #include "chrome/browser/policy/asynchronous_policy_loader.h"
-#include "chrome/browser/policy/policy_map.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
@@ -15,8 +14,12 @@ namespace policy {
 
 AsynchronousPolicyProvider::AsynchronousPolicyProvider(
     const PolicyDefinitionList* policy_list,
+    PolicyLevel level,
+    PolicyScope scope,
     scoped_refptr<AsynchronousPolicyLoader> loader)
     : ConfigurationPolicyProvider(policy_list),
+      level_(level),
+      scope_(scope),
       loader_(loader),
       pending_refreshes_(0),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {
@@ -36,7 +39,7 @@ bool AsynchronousPolicyProvider::ProvideInternal(PolicyMap* map) {
   DCHECK(CalledOnValidThread());
   if (!loader_->policy())
     return false;
-  map->LoadFrom(loader_->policy(), policy_definition_list());
+  map->LoadFrom(loader_->policy(), policy_definition_list(), level_, scope_);
   return true;
 }