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

chrome/browser/bookmarks/bookmark_html_writer.cc

Index: chrome/browser/bookmarks/bookmark_html_writer.cc
diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/bookmarks/bookmark_html_writer.cc
index 014fbead7f0a38bf997e7a794887f11658cd4e12..81b386106c81d83a653a3ea43eb1e2a370c3aad4 100644
--- a/chrome/browser/bookmarks/bookmark_html_writer.cc
+++ b/chrome/browser/bookmarks/bookmark_html_writer.cc
@@ -473,14 +473,16 @@ bool BookmarkFaviconFetcher::FetchNextFavicon() {
 
 void BookmarkFaviconFetcher::OnFaviconDataAvailable(
     FaviconService::Handle handle,
-    history::FaviconData favicon) {
+    history::FaviconData favicon_data,
+    std::vector<GURL> icon_urls_in_db) {
   GURL url;
   if (!bookmark_urls_.empty()) {
     url = GURL(bookmark_urls_.front());
     bookmark_urls_.pop_front();
   }
-  if (favicon.is_valid() && !url.is_empty()) {
-    favicons_map_->insert(make_pair(url.spec(), favicon.image_data));
+  if (favicon_data.has_valid_bitmaps() && !url.is_empty()) {
+    favicons_map_->insert(
+        make_pair(url.spec(), favicon_data.first_bitmap()));
   }
 
   if (FetchNextFavicon()) {