Surface error messages from ONC parsing in about:policy.

chrome/browser/policy/configuration_policy_handler.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 "chrome/browser/policy/configuration_policy_handler.h"
 
 #include <string>
 
 #include "base/file_path.h"
 #include "base/logging.h"
@@ skipping 148 matching lines @@
 
 TypeCheckingPolicyHandler::~TypeCheckingPolicyHandler() {
 }
 
 ConfigurationPolicyType TypeCheckingPolicyHandler::policy_type() const {
   return policy_type_;
 }
 
 bool TypeCheckingPolicyHandler::CheckPolicySettings(const PolicyMap& policies,
                                                     PolicyErrorMap* errors) {
-  const Value* value = policies.Get(policy_type_);
-  if (value && value_type_ != value->GetType()) {
+  const Value* value = NULL;
+  return CheckAndGetValue(policies, errors, &value);
+}
+
+bool TypeCheckingPolicyHandler::CheckAndGetValue(const PolicyMap& policies,
+                                                 PolicyErrorMap* errors,
+                                                 const Value** value) {
+  *value = policies.Get(policy_type_);
+  if (*value && !(*value)->IsType(value_type_)) {
     errors->AddError(policy_type_,
                      IDS_POLICY_TYPE_ERROR,
                      ValueTypeToString(value_type_));
     return false;
   }
   return true;
 }
 
-
 // SimplePolicyHandler implementation ------------------------------------------
 
 SimplePolicyHandler::SimplePolicyHandler(
     ConfigurationPolicyType policy_type,
     Value::Type value_type,
     const char* pref_path)
     : TypeCheckingPolicyHandler(policy_type, value_type),
       pref_path_(pref_path) {
 }
 
@@ skipping 698 matching lines @@
     }
   }
 
   if (setting != CONTENT_SETTING_DEFAULT) {
     prefs->SetValue(prefs::kManagedDefaultJavaScriptSetting,
                     Value::CreateIntegerValue(setting));
   }
 }
 
 }  // namespace policy