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 8145fb93e25ac843375de74b071c177510429ff7..8281b5c9602c67b7de76563c68c98663975af06c 100644
--- a/chrome/browser/ui/toolbar/back_forward_menu_model.h
+++ b/chrome/browser/ui/toolbar/back_forward_menu_model.h
@@ -94,7 +94,8 @@ class BackForwardMenuModel : public ui::MenuModel {
 
   // Callback from the favicon service.
   void OnFavIconDataAvailable(FaviconService::Handle handle,
-                              history::FaviconData favicon);
+                              history::FaviconData favicon_data,
+                              std::vector<GURL> icon_urls_in_db);
 
   // Allows the unit test to use its own dummy tab contents.
   void set_test_web_contents(content::WebContents* test_web_contents) {