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

chrome/browser/history/history_backend.h

Index: chrome/browser/history/history_backend.h
diff --git a/chrome/browser/history/history_backend.h b/chrome/browser/history/history_backend.h
index 6d50cc18f68ebc0dcb8f6be4751bcbb7353e24af..d493d4b5e86a2bd18af720aeabeab673a126a91c 100644
--- a/chrome/browser/history/history_backend.h
+++ b/chrome/browser/history/history_backend.h
@@ -649,13 +649,16 @@ class HistoryBackend : public base::RefCountedThreadSafe<HistoryBackend>,
 
   // If there is a favicon for |page_url| and one of the types in |icon_types|,
   // |favicon| is set appropriately and true is returned.
-  bool GetFaviconFromDB(const GURL& page_url,
-                        int icon_types,
-                        FaviconData* favicon);
+  bool GetFaviconFromDB(
+      const GURL& page_url,
+      int icon_types,
+      std::vector<FaviconBitmapResult>* favicon_bitmap_results);
 
   // Get favicon by the given |favicon_id|, the |favicon| is set appropriately
   // and true if returned on success, otherwise false is returned.
-  bool GetFaviconFromDB(FaviconID favicon_id, FaviconData* favicon);
+  bool GetFaviconFromDB(
+      FaviconID favicon_id,
+      std::vector<FaviconBitmapResult>* favicon_bitmap_results);
 
   // Notify any observers of an addition to the visit database.
   void NotifyVisitObservers(const VisitRow& visit);