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

chrome/browser/ui/webui/ntp/android/bookmarks_handler.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_UI_WEBUI_NTP_ANDROID_BOOKMARKS_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_NTP_ANDROID_BOOKMARKS_HANDLER_H_
 
 #include "base/values.h"
 #include "chrome/browser/bookmarks/base_bookmark_model_observer.h"
 #include "chrome/browser/cancelable_request.h"
@@ skipping 112 matching lines @@
 
   // Sends bookmark bar's bookmarks and sub folders and other folders back to
   // NTP.
   void QueryInitialBookmarks();
 
   // Sends the result back to Javascript
   void SendResult(const DictionaryValue& result);
 
   // Called once the favicon is loaded during creation of the bookmark shortcuts
   // and is available for use.
-  void OnShortcutFaviconDataAvailable(FaviconService::Handle handle,
-                                      history::FaviconData favicon);
+  void OnShortcutFaviconDataAvailable(
+      FaviconService::Handle handle,
+      const history::FaviconBitmapResult& bitmap_result);
 
   DISALLOW_COPY_AND_ASSIGN(BookmarksHandler);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_NTP_ANDROID_BOOKMARKS_HANDLER_H_