Removed ConfigurationPolicyType and extended PolicyMap.

chrome/browser/policy/configuration_policy_provider_win_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 <windows.h>
 
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
@@ skipping 118 matching lines @@
 TestHarness::TestHarness(HKEY hive)
     : hive_(hive) {}
 
 TestHarness::~TestHarness() {}
 
 void TestHarness::SetUp() {}
 
 AsynchronousPolicyProvider* TestHarness::CreateProvider(
     const PolicyDefinitionList* policy_definition_list) {
   return new ConfigurationPolicyProviderWin(policy_definition_list,
-                                            policy::kRegistryMandatorySubKey);
+                                            policy::kRegistryMandatorySubKey,
+                                            POLICY_LEVEL_MANDATORY);
 }
 
 void TestHarness::InstallEmptyPolicy() {}
 
 void TestHarness::InstallStringPolicy(const std::string& policy_name,
                                       const std::string& policy_value) {
   RegKey key(hive_, policy::kRegistryMandatorySubKey, KEY_ALL_ACCESS);
   key.WriteValue(UTF8ToUTF16(policy_name).c_str(),
                  UTF8ToUTF16(policy_value).c_str());
 }
@@ skipping 47 matching lines @@
 INSTANTIATE_TEST_CASE_P(
     ConfigurationPolicyProviderWinTest,
     ConfigurationPolicyProviderTest,
     testing::Values(TestHarness::CreateHKCU, TestHarness::CreateHKLM));
 
 // Test cases for windows policy provider specific functionality.
 class ConfigurationPolicyProviderWinTest : public AsynchronousPolicyTestBase {
  protected:
   ConfigurationPolicyProviderWinTest()
       : provider_(&test_policy_definitions::kList,
-                  policy::kRegistryMandatorySubKey) {}
+                  policy::kRegistryMandatorySubKey,
+                  POLICY_LEVEL_MANDATORY) {}
   virtual ~ConfigurationPolicyProviderWinTest() {}
 
   ScopedGroupPolicyRegistrySandbox registry_sandbox_;
   ConfigurationPolicyProviderWin provider_;
 };
 
 TEST_F(ConfigurationPolicyProviderWinTest, HKLMOverHKCU) {
   RegKey hklm_key(HKEY_LOCAL_MACHINE,
                   policy::kRegistryMandatorySubKey,
                   KEY_ALL_ACCESS);
   hklm_key.WriteValue(UTF8ToUTF16(test_policy_definitions::kKeyString).c_str(),
                       UTF8ToUTF16("hklm").c_str());
   RegKey hkcu_key(HKEY_CURRENT_USER,
                   policy::kRegistryMandatorySubKey,
                   KEY_ALL_ACCESS);
   hkcu_key.WriteValue(UTF8ToUTF16(test_policy_definitions::kKeyString).c_str(),
                       UTF8ToUTF16("hkcu").c_str());
 
   provider_.RefreshPolicies();
   loop_.RunAllPending();
 
   PolicyMap policy_map;
   provider_.Provide(&policy_map);
-  const Value* value = policy_map.Get(test_policy_definitions::kPolicyString);
+  const Value* value = policy_map.GetValue(test_policy_definitions::kKeyString);
   EXPECT_TRUE(StringValue("hklm").Equals(value));
 }
 
 }  // namespace policy