Change FaviconData to be able to return data for multiple bitmaps for same icon URL

chrome/browser/ui/webui/ntp/favicon_webui_handler.cc

Index: chrome/browser/ui/webui/ntp/favicon_webui_handler.cc
diff --git a/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc b/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc
index 1002ddd2eca6082c4a130f393d9ce3704f11674f..8ecc7852573e84ae6075e5261021c4002c8cdda4 100644
--- a/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc
+++ b/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc
@@ -119,14 +119,15 @@ void FaviconWebUIHandler::HandleGetFaviconDominantColor(const ListValue* args) {
 
 void FaviconWebUIHandler::OnFaviconDataAvailable(
     FaviconService::Handle request_handle,
-    history::FaviconData favicon) {
+    history::FaviconData favicon_data,
+    std::vector<GURL> icon_urls_in_db) {
   FaviconService* favicon_service =
       Profile::FromWebUI(web_ui())->GetFaviconService(Profile::EXPLICIT_ACCESS);
   int id = consumer_.GetClientData(favicon_service, request_handle);
   scoped_ptr<StringValue> color_value;
 
-  if (favicon.is_valid())
-    color_value.reset(GetDominantColorCssString(favicon.image_data));
+  if (favicon_data.has_valid_bitmaps())
+    color_value.reset(GetDominantColorCssString(favicon_data.first_bitmap()));
   else
     color_value.reset(new StringValue("#919191"));