Removed ConfigurationPolicyType and extended PolicyMap.

chrome/browser/policy/configuration_policy_provider_win_unittest.cc

Index: chrome/browser/policy/configuration_policy_provider_win_unittest.cc
diff --git a/chrome/browser/policy/configuration_policy_provider_win_unittest.cc b/chrome/browser/policy/configuration_policy_provider_win_unittest.cc
index 7e54902a1dfa57ca4381abce67556647930f3f1f..c3d68ff0e9d82843f276cc813f00b9506f2a8f5b 100644
--- a/chrome/browser/policy/configuration_policy_provider_win_unittest.cc
+++ b/chrome/browser/policy/configuration_policy_provider_win_unittest.cc
@@ -136,7 +136,8 @@ 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() {}
@@ -204,7 +205,8 @@ class ConfigurationPolicyProviderWinTest : public AsynchronousPolicyTestBase {
  protected:
   ConfigurationPolicyProviderWinTest()
       : provider_(&test_policy_definitions::kList,
-                  policy::kRegistryMandatorySubKey) {}
+                  policy::kRegistryMandatorySubKey,
+                  POLICY_LEVEL_MANDATORY) {}
   virtual ~ConfigurationPolicyProviderWinTest() {}
 
   ScopedGroupPolicyRegistrySandbox registry_sandbox_;
@@ -228,7 +230,7 @@ TEST_F(ConfigurationPolicyProviderWinTest, HKLMOverHKCU) {
 
   PolicyMap policy_map;
   provider_.Provide(&policy_map);
-  const Value* value = policy_map.Get(test_policy_definitions::kPolicyString);
+  const Value* value = policy_map.Get(test_policy_definitions::kKeyString);
   EXPECT_TRUE(StringValue("hklm").Equals(value));
 }