Removed ConfigurationPolicyType and extended PolicyMap.

chrome/browser/policy/configuration_policy_handler_chromeos.cc

Index: chrome/browser/policy/configuration_policy_handler_chromeos.cc
diff --git a/chrome/browser/policy/configuration_policy_handler_chromeos.cc b/chrome/browser/policy/configuration_policy_handler_chromeos.cc
index ac74293b0c2433138230a2555ca64eafbfb20b65..2941ddc9900a6b7e5b34456f5bbb2db61c8383ee 100644
--- a/chrome/browser/policy/configuration_policy_handler_chromeos.cc
+++ b/chrome/browser/policy/configuration_policy_handler_chromeos.cc
@@ -18,9 +18,9 @@
 namespace policy {
 
 NetworkConfigurationPolicyHandler::NetworkConfigurationPolicyHandler(
-    ConfigurationPolicyType type,
+    const char* policy_name,
     chromeos::NetworkUIData::ONCSource onc_source)
-    : TypeCheckingPolicyHandler(type, Value::TYPE_STRING),
+    : TypeCheckingPolicyHandler(policy_name, Value::TYPE_STRING),
       onc_source_(onc_source) {}
 
 NetworkConfigurationPolicyHandler::~NetworkConfigurationPolicyHandler() {}
@@ -38,7 +38,7 @@ bool NetworkConfigurationPolicyHandler::CheckPolicySettings(
     // Policy-based ONC blobs cannot have a passphrase.
     chromeos::OncNetworkParser parser(onc_blob, "", onc_source_);
     if (!parser.parse_error().empty()) {
-      errors->AddError(policy_type(),
+      errors->AddError(policy_name(),
                        IDS_POLICY_NETWORK_CONFIG_PARSE_ERROR,
                        parser.parse_error());
       return false;
@@ -57,15 +57,14 @@ void NetworkConfigurationPolicyHandler::ApplyPolicySettings(
 
 void NetworkConfigurationPolicyHandler::PrepareForDisplaying(
     PolicyMap* policies) const {
-  const Value* network_config = policies->Get(policy_type());
-  if (!network_config)
+  const PolicyMap::Entry* entry = policies->Get(policy_name());
+  if (!entry)
     return;
-
-  Value* sanitized_config = SanitizeNetworkConfig(network_config);
+  Value* sanitized_config = SanitizeNetworkConfig(entry->value);
   if (!sanitized_config)
     sanitized_config = Value::CreateNullValue();
 
-  policies->Set(policy_type(), sanitized_config);
+  policies->Set(policy_name(), entry->level, entry->scope, sanitized_config);
 }
 
 // static