Removed ConfigurationPolicyType and extended PolicyMap.

chrome/browser/policy/configuration_policy_handler_chromeos_unittest.cc

Index: chrome/browser/policy/configuration_policy_handler_chromeos_unittest.cc
diff --git a/chrome/browser/policy/configuration_policy_handler_chromeos_unittest.cc b/chrome/browser/policy/configuration_policy_handler_chromeos_unittest.cc
index 7cc1f8a4d837df768703f556187423e524f90eb2..2a1bc43404c2bf261d3b718d6d0f9396f5b89053 100644
--- a/chrome/browser/policy/configuration_policy_handler_chromeos_unittest.cc
+++ b/chrome/browser/policy/configuration_policy_handler_chromeos_unittest.cc
@@ -6,6 +6,7 @@
 
 #include "chrome/browser/policy/policy_error_map.h"
 #include "chrome/browser/policy/policy_map.h"
+#include "policy/policy_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace policy {
@@ -13,11 +14,11 @@ namespace policy {
 TEST(NetworkConfigurationPolicyHandlerTest, Empty) {
   PolicyMap policy_map;
   NetworkConfigurationPolicyHandler handler(
-      kPolicyOpenNetworkConfiguration,
+      key::kOpenNetworkConfiguration,
       chromeos::NetworkUIData::ONC_SOURCE_USER_POLICY);
   PolicyErrorMap errors;
   EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
-  EXPECT_TRUE(errors.GetErrors(kPolicyOpenNetworkConfiguration).empty());
+  EXPECT_TRUE(errors.GetErrors(key::kOpenNetworkConfiguration).empty());
 }
 
 TEST(NetworkConfigurationPolicyHandlerTest, ValidONC) {
@@ -35,39 +36,45 @@ TEST(NetworkConfigurationPolicyHandlerTest, ValidONC) {
       "}");
 
   PolicyMap policy_map;
-  policy_map.Set(kPolicyOpenNetworkConfiguration,
+  policy_map.Set(key::kOpenNetworkConfiguration,
+                 POLICY_LEVEL_MANDATORY,
+                 POLICY_SCOPE_USER,
                  Value::CreateStringValue(kTestONC));
   NetworkConfigurationPolicyHandler handler(
-      kPolicyOpenNetworkConfiguration,
+      key::kOpenNetworkConfiguration,
       chromeos::NetworkUIData::ONC_SOURCE_USER_POLICY);
   PolicyErrorMap errors;
   EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
-  EXPECT_TRUE(errors.GetErrors(kPolicyOpenNetworkConfiguration).empty());
+  EXPECT_TRUE(errors.GetErrors(key::kOpenNetworkConfiguration).empty());
 }
 
 TEST(NetworkConfigurationPolicyHandlerTest, WrongType) {
   PolicyMap policy_map;
-  policy_map.Set(kPolicyOpenNetworkConfiguration,
+  policy_map.Set(key::kOpenNetworkConfiguration,
+                 POLICY_LEVEL_MANDATORY,
+                 POLICY_SCOPE_USER,
                  Value::CreateBooleanValue(false));
   NetworkConfigurationPolicyHandler handler(
-      kPolicyOpenNetworkConfiguration,
+      key::kOpenNetworkConfiguration,
       chromeos::NetworkUIData::ONC_SOURCE_USER_POLICY);
   PolicyErrorMap errors;
   EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors));
-  EXPECT_FALSE(errors.GetErrors(kPolicyOpenNetworkConfiguration).empty());
+  EXPECT_FALSE(errors.GetErrors(key::kOpenNetworkConfiguration).empty());
 }
 
 TEST(NetworkConfigurationPolicyHandlerTest, JSONParseError) {
   const std::string kTestONC("I'm not proper JSON!");
   PolicyMap policy_map;
-  policy_map.Set(kPolicyOpenNetworkConfiguration,
+  policy_map.Set(key::kOpenNetworkConfiguration,
+                 POLICY_LEVEL_MANDATORY,
+                 POLICY_SCOPE_USER,
                  Value::CreateStringValue(kTestONC));
   NetworkConfigurationPolicyHandler handler(
-      kPolicyOpenNetworkConfiguration,
+      key::kOpenNetworkConfiguration,
       chromeos::NetworkUIData::ONC_SOURCE_USER_POLICY);
   PolicyErrorMap errors;
   EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors));
-  EXPECT_FALSE(errors.GetErrors(kPolicyOpenNetworkConfiguration).empty());
+  EXPECT_FALSE(errors.GetErrors(key::kOpenNetworkConfiguration).empty());
 }
 
 TEST(NetworkConfigurationPolicyHandlerTest, Sanitization) {
@@ -85,14 +92,16 @@ TEST(NetworkConfigurationPolicyHandlerTest, Sanitization) {
       "}");
 
   PolicyMap policy_map;
-  policy_map.Set(kPolicyOpenNetworkConfiguration,
+  policy_map.Set(key::kOpenNetworkConfiguration,
+                 POLICY_LEVEL_MANDATORY,
+                 POLICY_SCOPE_USER,
                  Value::CreateStringValue(kTestONC));
   NetworkConfigurationPolicyHandler handler(
-      kPolicyOpenNetworkConfiguration,
+      key::kOpenNetworkConfiguration,
       chromeos::NetworkUIData::ONC_SOURCE_USER_POLICY);
   PolicyErrorMap errors;
   handler.PrepareForDisplaying(&policy_map);
-  const Value* sanitized = policy_map.Get(kPolicyOpenNetworkConfiguration);
+  const Value* sanitized = policy_map.GetValue(key::kOpenNetworkConfiguration);
   ASSERT_TRUE(sanitized);
   std::string sanitized_onc;
   EXPECT_TRUE(sanitized->GetAsString(&sanitized_onc));