Removed ConfigurationPolicyType and extended PolicyMap.

chrome/browser/policy/configuration_policy_provider_win.cc

-// 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.
 
 #include "chrome/browser/policy/configuration_policy_provider_win.h"
 
 #include "chrome/browser/policy/configuration_policy_loader_win.h"
 #include "chrome/browser/policy/configuration_policy_provider_delegate_win.h"
 
 namespace policy {
 
 namespace {
 
 // Period at which to run the reload task in case the group policy change
 // watchers fail.
 const int kReloadIntervalMinutes = 15;
 
 }  // namespace
 
 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/17 09:52:45]

HKLM should be POLICY_SCOPE_MACHINE

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

Yes, that is planned for a subsequent CL. It requires changing the
AsynchronousPolicyProvider to expect a PolicyMap from the loader, instead of a
DictionaryValue, so that the loader can set the right policy level and scope at
each policy.

           new ConfigurationPolicyLoaderWin(
               new ConfigurationPolicyProviderDelegateWin(policy_list,
                                                          registry_key),
               kReloadIntervalMinutes)) {}
 
 }  // namespace policy