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

chrome/browser/ui/webui/extensions/extension_icon_source.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_EXTENSIONS_EXTENSION_ICON_SOURCE_H_
 #define CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_ICON_SOURCE_H_
 
 #include <map>
 #include <string>
 
@@ skipping 90 matching lines @@
 
   // Loads the extension's |icon| for the given |request_id| and returns the
   // image to the client.
   void LoadExtensionImage(const ExtensionResource& icon, int request_id);
 
   // Loads the favicon image for the app associated with the |request_id|. If
   // the image does not exist, we fall back to the default image.
   void LoadFaviconImage(int request_id);
 
   // FaviconService callback
-  void OnFaviconDataAvailable(FaviconService::Handle request_handle,
-                              history::FaviconData favicon);
+  void OnFaviconDataAvailable(
+      FaviconService::Handle request_handle,
+      const history::FaviconBitmapResult& bitmap_result);
 
   // ImageLoadingTracker::Observer
   virtual void OnImageLoaded(const gfx::Image& image,
                              const std::string& extension_id,
                              int id) OVERRIDE;
 
   // Called when the extension doesn't have an icon. We fall back to multiple
   // sources, using the following order:
   //  1) The icons as listed in the extension / app manifests.
   //  2) If a 16px icon and the extension has a launch URL, see if Chrome
@@ skipping 39 matching lines @@
   scoped_ptr<SkBitmap> default_app_data_;
 
   scoped_ptr<SkBitmap> default_extension_data_;
 
   CancelableRequestConsumerT<int, 0> cancelable_consumer_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionIconSource);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_ICON_SOURCE_H_