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

chrome/browser/favicon/favicon_handler.h

Index: chrome/browser/favicon/favicon_handler.h
diff --git a/chrome/browser/favicon/favicon_handler.h b/chrome/browser/favicon/favicon_handler.h
index 02b2f818de44507edaeead2d46b6bf6853528d97..ec215f457888c13ad40ab5272fbfe68c44a6545d 100644
--- a/chrome/browser/favicon/favicon_handler.h
+++ b/chrome/browser/favicon/favicon_handler.h
@@ -138,19 +138,19 @@ class FaviconHandler {
       const GURL& icon_url,
       history::IconType icon_type,
       CancelableRequestConsumerBase* consumer,
-      const FaviconService::FaviconDataCallback& callback);
+      const FaviconService::FaviconResultsCallback& callback);
 
   virtual void GetFavicon(
       const GURL& icon_url,
       history::IconType icon_type,
       CancelableRequestConsumerBase* consumer,
-      const FaviconService::FaviconDataCallback& callback);
+      const FaviconService::FaviconResultsCallback& callback);
 
   virtual void GetFaviconForURL(
       const GURL& page_url,
       int icon_types,
       CancelableRequestConsumerBase* consumer,
-      const FaviconService::FaviconDataCallback& callback);
+      const FaviconService::FaviconResultsCallback& callback);
 
   virtual void SetHistoryFavicon(const GURL& page_url,
                                  const GURL& icon_url,
@@ -198,8 +198,10 @@ class FaviconHandler {
   };
 
   // See description above class for details.
-  void OnFaviconDataForInitialURL(FaviconService::Handle handle,
-                                  history::FaviconData favicon);
+  void OnFaviconDataForInitialURL(
+      FaviconService::Handle handle,
+      std::vector<history::FaviconBitmapResult> favicon_bitmap_results,
+      history::IconURLSizesMap icon_url_sizes);
 
   // If the favicon has expired, asks the renderer to download the favicon.
   // Otherwise asks history to update the mapping between page url and icon
@@ -209,8 +211,10 @@ class FaviconHandler {
                                    history::IconType icon_type);
 
   // See description above class for details.
-  void OnFaviconData(FaviconService::Handle handle,
-                     history::FaviconData favicon);
+  void OnFaviconData(
+      FaviconService::Handle handle,
+      std::vector<history::FaviconBitmapResult> favicon_bitmap_results,
+      history::IconURLSizesMap icon_url_sizes);
 
   // Schedules a download for the specified entry. This adds the request to
   // download_requests_.
@@ -285,8 +289,8 @@ class FaviconHandler {
   // The prioritized favicon candidates from the page back from the renderer.
   std::deque<FaviconURL> image_urls_;
 
-  // The FaviconData from history.
-  history::FaviconData history_icon_;
+  // The FaviconBitmapResults from history.
+  std::vector<history::FaviconBitmapResult> history_results_;
 
   // The Profile associated with this handler.
   Profile* profile_;