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..afb15c52be66f215c633deeec5aae093c9a964e2 100644
--- a/chrome/browser/favicon/favicon_handler.h
+++ b/chrome/browser/favicon/favicon_handler.h
@@ -199,7 +199,8 @@ class FaviconHandler {
 
   // See description above class for details.
   void OnFaviconDataForInitialURL(FaviconService::Handle handle,
-                                  history::FaviconData favicon);
+                                  history::FaviconData favicon,
+                                  std::vector<GURL> icon_urls_in_db);
 
   // If the favicon has expired, asks the renderer to download the favicon.
   // Otherwise asks history to update the mapping between page url and icon
@@ -210,7 +211,8 @@ class FaviconHandler {
 
   // See description above class for details.
   void OnFaviconData(FaviconService::Handle handle,
-                     history::FaviconData favicon);
+                     history::FaviconData favicon,
+                     std::vector<GURL> icon_urls_in_db);
 
   // Schedules a download for the specified entry. This adds the request to
   // download_requests_.