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 1aa462978e9ddfb141305e30746b2a4515578e4c..2380d3ce82ce5b2876827da4409cc70f55ec9740 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,16 @@ 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));
+    std::vector<history::FaviconBitmapResult> favicon_bitmap_results;
+    if (bitmap.get() && bitmap->size()) {
+      history::FaviconBitmapResult bitmap_result;
+      bitmap_result.bitmap_data = bitmap;
+      bitmap_result.icon_type = history::FAVICON;
+      favicon_bitmap_results.push_back(bitmap_result);
+    }
+    request->ForwardResultAsync(request->handle(), favicon_bitmap_results,
+                                history::IconURLSizesMap());
   }
 }