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

chrome/browser/ui/toolbar/back_forward_menu_model.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_TOOLBAR_BACK_FORWARD_MENU_MODEL_H_
 #define CHROME_BROWSER_UI_TOOLBAR_BACK_FORWARD_MENU_MODEL_H_
 
 #include <set>
 #include <string>
 
@@ skipping 76 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(BackFwdMenuModelTest, MaxItemsTest);
   FRIEND_TEST_ALL_PREFIXES(BackFwdMenuModelTest, ChapterStops);
   FRIEND_TEST_ALL_PREFIXES(BackFwdMenuModelTest, EscapeLabel);
   FRIEND_TEST_ALL_PREFIXES(BackFwdMenuModelTest, FaviconLoadTest);
 
   // Requests a favicon from the FaviconService. Called by GetIconAt if the
   // NavigationEntry has an invalid favicon.
   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) {
     test_web_contents_ = test_web_contents;
   }
 
   // Returns how many history items the menu should show. For example, if the
   // navigation controller of the current tab has a current entry index of 5 and
   // forward_direction_ is false (we are the back button delegate) then this
   // function will return 5 (representing 0-4). If forward_direction_ is
@@ skipping 90 matching lines @@
   // Used for loading favicons from history.
   CancelableRequestConsumerTSimple<int> load_consumer_;
 
   // Used for receiving notifications when an icon is changed.
   ui::MenuModelDelegate* menu_model_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(BackForwardMenuModel);
 };
 
 #endif  // CHROME_BROWSER_UI_TOOLBAR_BACK_FORWARD_MENU_MODEL_H_