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

chrome/browser/ui/cocoa/history_menu_bridge.h

 // Copyright (c) 2011 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_COCOA_HISTORY_MENU_BRIDGE_H_
 #define CHROME_BROWSER_UI_COCOA_HISTORY_MENU_BRIDGE_H_
 
 #import <Cocoa/Cocoa.h>
 #include <map>
 #include <vector>
@@ skipping 172 matching lines @@
   HistoryItem* HistoryItemForTab(const TabRestoreService::Tab& entry);
 
   // Helper function that sends an async request to the FaviconService to get
   // an icon. The callback will update the NSMenuItem directly.
   void GetFaviconForHistoryItem(HistoryItem* item);
 
   // Callback for the FaviconService to return favicon image data when we
   // request it. This decodes the raw data, updates the HistoryItem, and then
   // sets the image on the menu. Called on the same same thread that
   // GetFaviconForHistoryItem() was called on (UI thread).
-  void GotFaviconData(FaviconService::Handle handle,
-                      history::FaviconData favicon);
+  void GotFaviconData(
+      FaviconService::Handle handle,
+      const history::FaviconImageResult& image_result);
 
   // Cancels a favicon load request for a given HistoryItem, if one is in
   // progress.
   void CancelFaviconRequest(HistoryItem* item);
 
  private:
   friend class ::HistoryMenuBridgeTest;
   friend class HistoryMenuCocoaControllerTest;
 
   scoped_nsobject<HistoryMenuCocoaController> controller_;  // strong
@@ skipping 19 matching lines @@
   bool create_in_progress_;
   bool need_recreate_;
 
   // The default favicon if a HistoryItem does not have one.
   scoped_nsobject<NSImage> default_favicon_;
 
   DISALLOW_COPY_AND_ASSIGN(HistoryMenuBridge);
 };
 
 #endif  // CHROME_BROWSER_UI_COCOA_HISTORY_MENU_BRIDGE_H_