Removed ConfigurationPolicyType and extended PolicyMap.

chrome/browser/policy/configuration_policy_handler_chromeos.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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 "chrome/browser/policy/configuration_policy_handler_chromeos.h"
 
 #include <string>
 
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
 #include "chrome/browser/chromeos/cros/onc_network_parser.h"
 #include "chrome/browser/policy/policy_error_map.h"
 #include "chrome/browser/policy/policy_map.h"
 #include "grit/generated_resources.h"
 
 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() {}
 
 bool NetworkConfigurationPolicyHandler::CheckPolicySettings(
     const PolicyMap& policies,
     PolicyErrorMap* errors) {
   const Value* value;
   if (!CheckAndGetValue(policies, errors, &value))
     return false;
 
   if (value) {
     std::string onc_blob;
     value->GetAsString(&onc_blob);
     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;
     }
   }
 
   return true;
 }
 
 void NetworkConfigurationPolicyHandler::ApplyPolicySettings(
     const PolicyMap& policies,
     PrefValueMap* prefs) {
   // Network policy is read directly from the provider and injected into
   // NetworkLibrary, so no need to convert the policy settings into prefs.
 }
 
 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
 Value* NetworkConfigurationPolicyHandler::SanitizeNetworkConfig(
     const Value* config) {
   std::string json_string;
   if (!config->GetAsString(&json_string))
     return NULL;
 
   scoped_ptr<Value> json_value(base::JSONReader::Read(json_string, true));
@@ skipping 39 matching lines @@
 
   for (size_t i = 0; i < arraysize(kFilteredSettings); ++i) {
     if (network_dict->Remove(kFilteredSettings[i], NULL)) {
       network_dict->Set(kFilteredSettings[i],
                         Value::CreateStringValue(kPlaceholder));
     }
   }
 }
 
 }  // namespace policy