Removed ConfigurationPolicyType and extended PolicyMap.

chrome/browser/policy/config_dir_policy_provider.cc

Index: chrome/browser/policy/config_dir_policy_provider.cc
diff --git a/chrome/browser/policy/config_dir_policy_provider.cc b/chrome/browser/policy/config_dir_policy_provider.cc
index c36485cc6136ba475858657c4ec27b0c93386862..ce24a5578145fca61beab62ac4153eed6a3d1d69 100644
--- a/chrome/browser/policy/config_dir_policy_provider.cc
+++ b/chrome/browser/policy/config_dir_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.
 
@@ -82,9 +82,12 @@ base::Time ConfigDirPolicyProviderDelegate::GetLastModification() {
 
 ConfigDirPolicyProvider::ConfigDirPolicyProvider(
     const PolicyDefinitionList* policy_list,
+    PolicyLevel level,
     const FilePath& config_dir)
     : FileBasedPolicyProvider(
         policy_list,
+        level,
+        POLICY_SCOPE_USER,

[Mattias Nissler (ping if slow), 2012/01/17 09:52:45]

should be POLICY_SCOPE_DEVICE

btw., should we rename POLICY_SCOPE_DEVICE to POLICY_SCOPE_MACHINE? That would
be more in line with the group policy terms and "machine" is also not quite as
overloaded as "device" is.

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

Done.
Agree, done.

         new ConfigDirPolicyProviderDelegate(config_dir)) {
 }