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

chrome/browser/printing/print_dialog_cloud.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/printing/print_dialog_cloud.h"
 #include "chrome/browser/printing/print_dialog_cloud_internal.h"
 
 #include "base/base64.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ skipping 81 matching lines @@
 // that the dialog should be closed, at which point things are torn
 // down and released.
 
 // TODO(scottbyer):
 // http://code.google.com/p/chromium/issues/detail?id=44093 The
 // high-level flow (where the data is generated before even
 // bringing up the dialog) isn't what we want.
 
 namespace internal_cloud_print_helpers {
 
-bool GetDoubleOrInt(const DictionaryValue& dictionary,
-                    const std::string& path,
-                    double* out_value) {
-  if (!dictionary.GetDouble(path, out_value)) {
-    int int_value = 0;
-    if (!dictionary.GetInteger(path, &int_value))
-      return false;
-    *out_value = int_value;
-  }
-  return true;
-}
-
 // From the JSON parsed value, get the entries for the page setup
 // parameters.
 bool GetPageSetupParameters(const std::string& json,
                             PrintMsg_Print_Params& parameters) {
   scoped_ptr<Value> parsed_value(base::JSONReader::Read(json, false));
   DLOG_IF(ERROR, (!parsed_value.get() ||
                   !parsed_value->IsType(Value::TYPE_DICTIONARY)))
       << "PageSetup call didn't have expected contents";
   if (!parsed_value.get() || !parsed_value->IsType(Value::TYPE_DICTIONARY))
     return false;
 
   bool result = true;
   DictionaryValue* params = static_cast<DictionaryValue*>(parsed_value.get());
-  result &= GetDoubleOrInt(*params, "dpi", &parameters.dpi);
-  result &= GetDoubleOrInt(*params, "min_shrink", &parameters.min_shrink);
-  result &= GetDoubleOrInt(*params, "max_shrink", &parameters.max_shrink);
+  result &= params->GetDouble("dpi", &parameters.dpi);
+  result &= params->GetDouble("min_shrink", &parameters.min_shrink);
+  result &= params->GetDouble("max_shrink", &parameters.max_shrink);
   result &= params->GetBoolean("selection_only", &parameters.selection_only);
   return result;
 }
 
 void CloudPrintDataSenderHelper::CallJavascriptFunction(
     const std::wstring& function_name) {
   web_ui_->CallJavascriptFunction(WideToASCII(function_name));
 }
 
 void CloudPrintDataSenderHelper::CallJavascriptFunction(
@@ skipping 485 matching lines @@
                                                    print_job_title,
                                                    file_type,
                                                    false);
       return true;
     }
   }
   return false;
 }
 
 }  // end namespace