Removed ConfigurationPolicyType and extended PolicyMap.

chrome/browser/policy/configuration_policy_provider_mac.cc

Index: chrome/browser/policy/configuration_policy_provider_mac.cc
diff --git a/chrome/browser/policy/configuration_policy_provider_mac.cc b/chrome/browser/policy/configuration_policy_provider_mac.cc
index 213896da4c07fd4978529d47b95de4b16084aa34..8daf4b8e118d92af21812dea0f563e8268737555 100644
--- a/chrome/browser/policy/configuration_policy_provider_mac.cc
+++ b/chrome/browser/policy/configuration_policy_provider_mac.cc
@@ -133,18 +133,25 @@ base::Time MacPreferencesPolicyProviderDelegate::GetLastModification() {
 }
 
 ConfigurationPolicyProviderMac::ConfigurationPolicyProviderMac(
-    const PolicyDefinitionList* policy_list)
-    : FileBasedPolicyProvider(policy_list,
+    const PolicyDefinitionList* policy_list,
+    PolicyLevel level)
+    : FileBasedPolicyProvider(
+          policy_list,
+          level,
+          POLICY_SCOPE_USER,

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

It looks like there is a way to figure out whether a setting on the mac is
machine-scope vs. user-scope after all:
http://developer.apple.com/library/mac/documentation/CoreFoundation/Reference...

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

Will use that when refactoring the mac provider!

Looking at that API, I'd guess SCOPE_MACHINE is when the function is invoked
with AnyUser and CurrentHost, while SCOPE_USER is CurrentUser and AnyHost. We'll
have to check if this does what we expect.

[Mattias Nissler (ping if slow), 2012/01/18 15:07:07]

I think user-level should rather be CurrentUser and CurrentHost, as otherwise we
might miss settings, otherwise I agree.

           new MacPreferencesPolicyProviderDelegate(new MacPreferences,
                                                    policy_list)) {
 }
 
 ConfigurationPolicyProviderMac::ConfigurationPolicyProviderMac(
     const PolicyDefinitionList* policy_list,
+    PolicyLevel level,
     MacPreferences* preferences)
-    : FileBasedPolicyProvider(policy_list,
-          new MacPreferencesPolicyProviderDelegate(preferences,
-                                                   policy_list)) {
+    : FileBasedPolicyProvider(
+          policy_list,
+          level,
+          POLICY_SCOPE_USER,
+          new MacPreferencesPolicyProviderDelegate(preferences, policy_list)) {
 }
 
 }  // namespace policy