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

chrome/browser/ui/toolbar/back_forward_menu_model.h

Index: chrome/browser/ui/toolbar/back_forward_menu_model.h
diff --git a/chrome/browser/ui/toolbar/back_forward_menu_model.h b/chrome/browser/ui/toolbar/back_forward_menu_model.h
index 97f1155295bf8900777fb8cd69b63a151c6da621..23f7a3eaf333e343391de19235f5b23299b1a83a 100644
--- a/chrome/browser/ui/toolbar/back_forward_menu_model.h
+++ b/chrome/browser/ui/toolbar/back_forward_menu_model.h
@@ -94,8 +94,9 @@ class BackForwardMenuModel : public ui::MenuModel {
   void FetchFavicon(content::NavigationEntry* entry);
 
   // Callback from the favicon service.
-  void OnFavIconDataAvailable(FaviconService::Handle handle,
-                              history::FaviconData favicon);
+  void OnFavIconDataAvailable(
+    FaviconService::Handle handle,
+    const history::FaviconImageResult& image_result);
 
   // Allows the unit test to use its own dummy tab contents.
   void set_test_web_contents(content::WebContents* test_web_contents) {