Removed ConfigurationPolicyType and extended PolicyMap.

chrome/browser/policy/configuration_policy_provider_mac_unittest.cc

 // Copyright (c) 2011 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 <gtest/gtest.h>
 
 #include "base/basictypes.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/policy/asynchronous_policy_test_base.h"
@@ skipping 40 matching lines @@
 
 TestHarness::TestHarness() {}
 
 TestHarness::~TestHarness() {}
 
 void TestHarness::SetUp() {}
 
 AsynchronousPolicyProvider* TestHarness::CreateProvider(
     const PolicyDefinitionList* policy_definition_list) {
   prefs_ = new MockPreferences();
-  return new ConfigurationPolicyProviderMac(policy_definition_list, prefs_);
+  return new ConfigurationPolicyProviderMac(policy_definition_list,
+                                            POLICY_LEVEL_MANDATORY,
+                                            prefs_);
 }
 
 void TestHarness::InstallEmptyPolicy() {}
 
 void TestHarness::InstallStringPolicy(const std::string& policy_name,
                                       const std::string& policy_value) {
   ScopedCFTypeRef<CFStringRef> name(base::SysUTF8ToCFStringRef(policy_name));
   ScopedCFTypeRef<CFStringRef> value(base::SysUTF8ToCFStringRef(policy_value));
   prefs_->AddTestItem(name, value, true);
 }
@@ skipping 44 matching lines @@
 INSTANTIATE_TEST_CASE_P(
     ConfigurationPolicyProviderMacTest,
     ConfigurationPolicyProviderTest,
     testing::Values(TestHarness::Create));
 
 // Special test cases for some mac preferences details.
 class ConfigurationPolicyProviderMacTest : public AsynchronousPolicyTestBase {
  protected:
   ConfigurationPolicyProviderMacTest()
       : prefs_(new MockPreferences()),
-        provider_(&test_policy_definitions::kList, prefs_) {}
+        provider_(&test_policy_definitions::kList,
+                  POLICY_LEVEL_MANDATORY,
+                  prefs_) {}
   virtual ~ConfigurationPolicyProviderMacTest() {}
 
   MockPreferences* prefs_;
   ConfigurationPolicyProviderMac provider_;
 };
 
 TEST_F(ConfigurationPolicyProviderMacTest, Invalid) {
   ScopedCFTypeRef<CFStringRef> name(
       base::SysUTF8ToCFStringRef(test_policy_definitions::kKeyString));
   ScopedCFTypeRef<CFDataRef> invalid_data(CFDataCreate(NULL, NULL, 0));
@@ skipping 17 matching lines @@
 
   // Create the provider and have it read |prefs_|.
   provider_.RefreshPolicies();
   loop_.RunAllPending();
   PolicyMap policy_map;
   EXPECT_TRUE(provider_.Provide(&policy_map));
   EXPECT_TRUE(policy_map.empty());
 }
 
 }  // namespace policy