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

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

 // Copyright (c) 2012 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/bind.h"
 #include "base/bind_helpers.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
@@ skipping 101 matching lines @@
       url,
       history::FAVICON,
       &consumer_,
       base::Bind(&FaviconWebUIHandler::OnFaviconDataAvailable,
                  base::Unretained(this)));
   consumer_.SetClientData(favicon_service, handle, id_++);
 }
 
 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"));
 
   StringValue dom_id(dom_id_map_[id]);
   web_ui()->CallJavascriptFunction("ntp.setStripeColor", dom_id, *color_value);
   dom_id_map_.erase(id);
 }
 
 void FaviconWebUIHandler::HandleGetAppIconDominantColor(
     const ListValue* args) {
@@ skipping 15 matching lines @@
   std::vector<unsigned char> bits;
   if (!gfx::PNGCodec::EncodeBGRASkBitmap(bitmap, true, &bits))
     return;
   scoped_refptr<base::RefCountedStaticMemory> bits_mem(
       new base::RefCountedStaticMemory(&bits.front(), bits.size()));
   scoped_ptr<StringValue> color_value(GetDominantColorCssString(bits_mem));
   StringValue id(extension_id);
   web_ui()->CallJavascriptFunction(
       "ntp.setStripeColor", id, *color_value);
 }