Removed ConfigurationPolicyType and extended PolicyMap.

chrome/browser/policy/configuration_policy_provider_win.cc

Index: chrome/browser/policy/configuration_policy_provider_win.cc
diff --git a/chrome/browser/policy/configuration_policy_provider_win.cc b/chrome/browser/policy/configuration_policy_provider_win.cc
index f968e2c7873c70e42017de23ff281829b61913ca..e236b05cd74018e772e88d17309ca8e5bd98eff8 100644
--- a/chrome/browser/policy/configuration_policy_provider_win.cc
+++ b/chrome/browser/policy/configuration_policy_provider_win.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.
 
@@ -19,9 +19,12 @@ const int kReloadIntervalMinutes = 15;
 
 ConfigurationPolicyProviderWin::ConfigurationPolicyProviderWin(
     const PolicyDefinitionList* policy_list,
-    const string16& registry_key)
+    const string16& registry_key,
+    PolicyLevel level)
     : AsynchronousPolicyProvider(
           policy_list,
+          level,
+          POLICY_SCOPE_USER,

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

that should be POLICY_SCOPE_DEVICE for HKLM, no?

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

The provider should set the scope as DEVICE or USER at each policy individually
depending on whether it comes from HKLM or HKCU. That requires more substantial
changes to AsynchronousPolicyProvider (such as directly getting a PolicyMap from
its loader, or more than one DictionaryValue, so that each policy can have its
own flags together with the Value). Will be done in a subsequent CL.

           new ConfigurationPolicyLoaderWin(
               new ConfigurationPolicyProviderDelegateWin(policy_list,
                                                          registry_key),