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

chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
index 4039c97f1d84031a721134128a7512004b226407..ae320daddcd223bce85f1a262a11a39f8c780612 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -479,13 +479,15 @@ void ChromeWebUIControllerFactory::GetFaviconForURL(
       url.host() != extension_misc::kBookmarkManagerId) {
     ExtensionWebUI::GetFaviconForURL(profile, request, url);
   } else {
-    history::FaviconData favicon;
-    favicon.image_data = scoped_refptr<base::RefCountedMemory>(
-        GetFaviconResourceBytes(url));
-    favicon.known_icon = favicon.image_data.get() != NULL &&
-                             favicon.image_data->size() > 0;
-    favicon.icon_type = history::FAVICON;
-    request->ForwardResultAsync(request->handle(), favicon);
+    scoped_refptr<base::RefCountedMemory> bitmap(GetFaviconResourceBytes(url));
+    history::FaviconBitmapData favicon_bitmap_data;
+    favicon_bitmap_data.bitmap_data = bitmap;
+    favicon_bitmap_data.pixel_size = gfx::Size();
+    history::FaviconData favicon_data;
+    favicon_data.icon_type = history::FAVICON;
+    favicon_data.bitmaps.push_back(favicon_bitmap_data);
+    request->ForwardResultAsync(request->handle(), favicon_data,
+                                std::vector<GURL>());
   }
 }