Removed ConfigurationPolicyType and extended PolicyMap.

chrome/browser/policy/asynchronous_policy_provider.h

Index: chrome/browser/policy/asynchronous_policy_provider.h
diff --git a/chrome/browser/policy/asynchronous_policy_provider.h b/chrome/browser/policy/asynchronous_policy_provider.h
index 79720e9ebe9c350c162a42866912e5a33451a3a6..c9787c6e3050c49fc47690ea7a68b2332e5b1862 100644
--- a/chrome/browser/policy/asynchronous_policy_provider.h
+++ b/chrome/browser/policy/asynchronous_policy_provider.h
@@ -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.
 
@@ -10,6 +10,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "chrome/browser/policy/configuration_policy_provider.h"
+#include "chrome/browser/policy/policy_map.h"
 
 namespace policy {
 
@@ -35,6 +36,8 @@ class AsynchronousPolicyProvider
   // Assumes ownership of |loader|.
   AsynchronousPolicyProvider(
       const PolicyDefinitionList* policy_list,
+      PolicyLevel level,
+      PolicyScope scope,
       scoped_refptr<AsynchronousPolicyLoader> loader);
   virtual ~AsynchronousPolicyProvider();
 
@@ -53,6 +56,10 @@ class AsynchronousPolicyProvider
   // a reload of the policies.
   void OnLoaderReloaded();
 
+  // The policy level and scope for policies loaded through this provider.
+  PolicyLevel level_;
+  PolicyScope scope_;

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

having the scope per-provider here might not be appropriate for the windows
provider (see other comment)

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

This is meant to be removed once all the providers can load both user/device and
mandatory/recommended policies. It was introduced because each provider is
currently loading only one combination of scope+level.

+
   // The loader object used internally.
   scoped_refptr<AsynchronousPolicyLoader> loader_;