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

chrome/browser/ui/webui/favicon_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_FAVICON_SOURCE_H_
 #define CHROME_BROWSER_UI_WEBUI_FAVICON_SOURCE_H_
 
 #include <map>
 #include <string>
 
@@ skipping 36 matching lines @@
 
  protected:
   virtual ~FaviconSource();
 
   Profile* profile_;
 
  private:
   void Init(Profile* profile, IconType type);
 
   // 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);
 
   // Sends the default favicon.
   void SendDefaultResponse(int request_id);
 
   CancelableRequestConsumerT<int, 0> cancelable_consumer_;
 
   // Map from request ID to size requested (in pixels). TODO(estade): Get rid of
   // this map when we properly support multiple favicon sizes.
   std::map<int, int> request_size_map_;
 
   // Raw PNG representation of the favicon to show when the favicon
   // database doesn't have a favicon for a webpage.
   // 16x16
   scoped_refptr<base::RefCountedMemory> default_favicon_;
   // 32x32
   scoped_refptr<base::RefCountedMemory> default_favicon_large_;
 
   // The history::IconTypes of icon that this FaviconSource handles.
   int icon_types_;
 
   DISALLOW_COPY_AND_ASSIGN(FaviconSource);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_FAVICON_SOURCE_H_