more changes

chrome/browser/ui/webui/ntp/favicon_webui_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/ui/webui/ntp/favicon_webui_handler.h"
 
 #include "base/callback.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 36 matching lines @@
       NewCallback(this, &FaviconWebUIHandler::OnFaviconDataAvailable));
   consumer_.SetClientData(favicon_service, handle, static_cast<int>(id));
 }
 
 void FaviconWebUIHandler::OnFaviconDataAvailable(
     FaviconService::Handle request_handle,
     history::FaviconData favicon) {
   FaviconService* favicon_service =
       Profile::FromWebUI(web_ui_)->GetFaviconService(Profile::EXPLICIT_ACCESS);
   int id = consumer_.GetClientData(favicon_service, request_handle);
-  base::FundamentalValue id_value(id);
+  base::NumberValue id_value(id);
   scoped_ptr<StringValue> color_value;
 
   if (favicon.is_valid()) {
     // TODO(estade): cache the response
     color_utils::GridSampler sampler;
     SkColor color =
         color_utils::CalculateKMeanColorOfPNG(favicon.image_data, 100, 665,
                                               sampler);
     std::string css_color = base::StringPrintf("rgb(%d, %d, %d)",
                                                SkColorGetR(color),
                                                SkColorGetG(color),
                                                SkColorGetB(color));
-    color_value.reset(new StringValue(css_color));
+    color_value.reset(base::StringValue::New(css_color));
   } else {
-    color_value.reset(new StringValue("#919191"));
+    color_value.reset(base::StringValue::New("#919191"));
   }
 
   web_ui_->CallJavascriptFunction("ntp4.setFaviconDominantColor",
                                   id_value, *color_value);
 }