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

chrome/browser/ui/webui/ntp/favicon_webui_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_FAVICON_WEBUI_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_NTP_FAVICON_WEBUI_HANDLER_H_
 
 #include <map>
 #include <string>
 
@@ skipping 22 matching lines @@
   void HandleGetFaviconDominantColor(const base::ListValue* args);
 
   // As above, but for an app tile. The sole argument is the extension ID.
   void HandleGetAppIconDominantColor(const base::ListValue* args);
 
   // Callback getting signal that an app icon is loaded.
   void NotifyAppIconReady(const std::string& extension_id);
 
  private:
   // Called when favicon data is available from the history backend.
-  void OnFaviconDataAvailable(FaviconService::Handle request_handle,
-                              history::FaviconData favicon);
+  void OnFaviconDataAvailable(
+      FaviconService::Handle request_handle,
+      const history::FaviconBitmapResult& bitmap_result);
 
   CancelableRequestConsumerTSimple<int> consumer_;
 
   // Map from request ID to DOM ID so we can make the appropriate callback when
   // the favicon request comes back. This map exists because
   // CancelableRequestConsumerTSimple only takes POD keys.
   std::map<int, std::string> dom_id_map_;
   // A counter to track ID numbers as we use them.
   int id_;
 
   // Raw PNG representation of the favicon to show when the favicon
   // database doesn't have a favicon for a webpage.
   scoped_refptr<base::RefCountedMemory> default_favicon_;
 
   // Manage retrieval of icons from apps.
   scoped_ptr<ExtensionIconColorManager> app_icon_color_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(FaviconWebUIHandler);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_NTP_FAVICON_WEBUI_HANDLER_H_