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

chrome/browser/themes/browser_theme_pack.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/themes/browser_theme_pack.h"
 
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/utf_string_conversions.h"
@@ skipping 280 matching lines @@
         char* data = reinterpret_cast<char*>(&(raw_data.front()));
         if (file.ReadUntilComplete(data, size) == avail)
           return RefCountedBytes::TakeVector(&raw_data);
       }
     }
   }
 
   return NULL;
 }
 
-// Does error checking for invalid incoming data while trying to read an
-// floating point value.
-bool ValidDoubleValue(ListValue* tint_list, int index, double* out) {
-  if (tint_list->GetDouble(index, out))
-    return true;
-
-  int value = 0;
-  if (tint_list->GetInteger(index, &value)) {
-    *out = value;
-    return true;
-  }
-
-  return false;
-}
-
 // Shifts a bitmap's HSL values. The caller is responsible for deleting
 // the returned image.
 gfx::Image* CreateHSLShiftedImage(const gfx::Image& image,
                                   const color_utils::HSL& hsl_shift) {
   std::vector<const SkBitmap*> bitmaps;
   for (size_t i = 0; i < image.GetNumberOfSkBitmaps(); ++i) {
     const SkBitmap* bitmap = image.GetSkBitmapAtIndex(i);
     bitmaps.push_back(new SkBitmap(SkBitmapOperations::CreateHSLShiftedBitmap(
         *bitmap, hsl_shift)));
   }
@@ skipping 313 matching lines @@
 
   // Parse the incoming data from |tints_value| into an intermediary structure.
   std::map<int, color_utils::HSL> temp_tints;
   for (DictionaryValue::key_iterator iter(tints_value->begin_keys());
        iter != tints_value->end_keys(); ++iter) {
     ListValue* tint_list;
     if (tints_value->GetList(*iter, &tint_list) &&
         (tint_list->GetSize() == 3)) {
       color_utils::HSL hsl = { -1, -1, -1 };
 
-      if (ValidDoubleValue(tint_list, 0, &hsl.h) &&
-          ValidDoubleValue(tint_list, 1, &hsl.s) &&
-          ValidDoubleValue(tint_list, 2, &hsl.l)) {
+      if (tint_list->GetDouble(0, &hsl.h) &&
+          tint_list->GetDouble(1, &hsl.s) &&
+          tint_list->GetDouble(2, &hsl.l)) {
         int id = GetIntForString(*iter, kTintTable);
         if (id != -1) {
           temp_tints[id] = hsl;
         }
       }
     }
   }
 
   // Copy data from the intermediary data structure to the array.
   int count = 0;
@@ skipping 410 matching lines @@
         hsl.h = tints_[i].h;
         hsl.s = tints_[i].s;
         hsl.l = tints_[i].l;
         return hsl;
       }
     }
   }
 
   return ThemeService::GetDefaultTint(id);
 }