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

chrome/browser/extensions/extension_web_ui.cc

Index: chrome/browser/extensions/extension_web_ui.cc
diff --git a/chrome/browser/extensions/extension_web_ui.cc b/chrome/browser/extensions/extension_web_ui.cc
index 71f8d41e0845893275ef4df3e2f11c7a939a50ea..3925088b30071bcba7eb1479ca81ac8cb2f77586 100644
--- a/chrome/browser/extensions/extension_web_ui.cc
+++ b/chrome/browser/extensions/extension_web_ui.cc
@@ -131,11 +131,14 @@ class ExtensionWebUIImageLoadingTracker : public ImageLoadingTracker::Observer {
   // |icon_data| may be backed by NULL. Once the result has been forwarded the
   // instance is deleted.
   void ForwardResult(scoped_refptr<base::RefCountedMemory> icon_data) {
-    history::FaviconData favicon;
-    favicon.known_icon = icon_data.get() != NULL && icon_data->size() > 0;
-    favicon.image_data = icon_data;
-    favicon.icon_type = history::FAVICON;
-    request_->ForwardResultAsync(request_->handle(), favicon);
+    history::FaviconData favicon_data;
+    favicon_data.known_icon = icon_data.get() != NULL && icon_data->size() > 0;
+    favicon_data.icon_type = history::FAVICON;
+    history::FaviconBitmapData favicon_bitmap_data;
+    favicon_bitmap_data.bitmap_data = icon_data;
+    favicon_data.bitmaps.push_back(favicon_bitmap_data);
+    request_->ForwardResultAsync(request_->handle(), favicon_data,
+                                 std::vector<GURL>());
     delete this;
   }