Use new APIs in base/values.h: Value::GetAsNumber and DictionaryValue::GetNumber.

chrome/common/json_schema_validator.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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/common/json_schema_validator.h"
 
 #include <cfloat>
 #include <cmath>
 
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
 
 double GetNumberValue(Value* value) {
   double result = 0;
-  if (value->GetAsDouble(&result))
-    return result;
-
-  int int_result = 0;
-  if (value->GetAsInteger(&int_result)) {
-    return int_result;
-  }
-
-  CHECK(false) << "Unexpected value type: " << value->GetType();
-  return 0;
-}
-
-bool GetNumberFromDictionary(DictionaryValue* value, const std::string& key,
-                             double* number) {
-  if (value->GetDouble(key, number))
-    return true;
-
-  int int_value = 0;
-  if (value->GetInteger(key, &int_value)) {
-    *number = int_value;
-    return true;
-  }
-
-  return false;
+  CHECK(value->GetAsDouble(&result))
+      << "Unexpected value type: " << value->GetType();
+  return result;
 }
 
 }  // namespace
 
 
 JSONSchemaValidator::Error::Error() {
 }
 
 JSONSchemaValidator::Error::Error(const std::string& message)
     : path(message) {
@@ skipping 399 matching lines @@
 
 void JSONSchemaValidator::ValidateNumber(Value* instance,
                                          DictionaryValue* schema,
                                          const std::string& path) {
   double value = GetNumberValue(instance);
 
   // TODO(aa): It would be good to test that the double is not infinity or nan,
   // but isnan and isinf aren't defined on Windows.
 
   double minimum = 0;
-  if (GetNumberFromDictionary(schema, "minimum", &minimum)) {
+  if (schema->GetDouble("minimum", &minimum)) {
     if (value < minimum)
       errors_.push_back(Error(path, FormatErrorMessage(
           kNumberMinimum, base::DoubleToString(minimum))));
   }
 
   double maximum = 0;
-  if (GetNumberFromDictionary(schema, "maximum", &maximum)) {
+  if (schema->GetDouble("maximum", &maximum)) {
     if (value > maximum)
       errors_.push_back(Error(path, FormatErrorMessage(
           kNumberMaximum, base::DoubleToString(maximum))));
   }
 }
 
 bool JSONSchemaValidator::ValidateType(Value* instance,
                                        const std::string& expected_type,
                                        const std::string& path) {
   std::string actual_type = GetJSONSchemaType(instance);
@@ skipping 15 matching lines @@
 
   if (*additional_properties_schema) {
     std::string additional_properties_type("any");
     CHECK((*additional_properties_schema)->GetString(
         "type", &additional_properties_type));
     return additional_properties_type == "any";
   } else {
     return default_allow_additional_properties_;
   }
 }