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

chrome/browser/bookmarks/bookmark_html_writer.h

 // Copyright (c) 2012 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_BOOKMARKS_BOOKMARK_HTML_WRITER_H_
 #define CHROME_BROWSER_BOOKMARKS_BOOKMARK_HTML_WRITER_H_
 
 #include <list>
 #include <map>
 #include <string>
@@ skipping 46 matching lines @@
   // Executes Writer task that writes bookmarks data to html file.
   void ExecuteWriter();
 
   // Starts async fetch for the next bookmark favicon.
   // Takes single url from bookmark_urls_ and removes it from the list.
   // Returns true if there are more favicons to extract.
   bool FetchNextFavicon();
 
   // Favicon fetch callback. After all favicons are fetched executes
   // html output on the file thread.
-  void OnFaviconDataAvailable(FaviconService::Handle handle,
-                              history::FaviconData favicon);
+  void OnFaviconDataAvailable(
+      FaviconService::Handle handle,
+      const history::FaviconBitmapResult& bitmap_result);
 
   // The Profile object used for accessing FaviconService, bookmarks model.
   Profile* profile_;
 
   // All URLs that are extracted from bookmarks. Used to fetch favicons
   // for each of them. After favicon is fetched top url is removed from list.
   std::list<std::string> bookmark_urls_;
 
   // Consumer for requesting favicons.
   CancelableRequestConsumer favicon_consumer_;
@@ skipping 18 matching lines @@
 // thread is used.
 // Before writing to the file favicons are fetched on the main thread.
 // TODO(sky): need a callback on failure.
 void WriteBookmarks(Profile* profile,
                     const FilePath& path,
                     BookmarksExportObserver* observer);
 
 }  // namespace bookmark_html_writer
 
 #endif  // CHROME_BROWSER_BOOKMARKS_BOOKMARK_HTML_WRITER_H_