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

chrome/browser/ui/webui/extensions/extension_icon_source.cc

 // 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.
 
 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/stl_util.h"
@@ skipping 205 matching lines @@
       favicon_url,
       history::FAVICON,
       &cancelable_consumer_,
       base::Bind(&ExtensionIconSource::OnFaviconDataAvailable,
                  base::Unretained(this)));
   cancelable_consumer_.SetClientData(favicon_service, handle, request_id);
 }
 
 void ExtensionIconSource::OnFaviconDataAvailable(
     FaviconService::Handle request_handle,
-    history::FaviconData favicon) {
+    history::FaviconData favicon_data,
+    std::vector<GURL> icon_urls_in_db) {
   int request_id = cancelable_consumer_.GetClientData(
       profile_->GetFaviconService(Profile::EXPLICIT_ACCESS), request_handle);
   ExtensionIconRequest* request = GetData(request_id);
 
   // Fallback to the default icon if there wasn't a favicon.
-  if (!favicon.is_valid()) {
+  if (!favicon_data.has_valid_bitmaps()) {
     LoadDefaultImage(request_id);
     return;
   }
 
+  scoped_refptr<base::RefCountedMemory> bitmap_data =
+      favicon_data.first_bitmap();
   if (!request->grayscale) {
     // If we don't need a grayscale image, then we can bypass FinalizeImage
     // to avoid unnecessary conversions.
     ClearData(request_id);
-    SendResponse(request_id, favicon.image_data);
+    SendResponse(request_id, bitmap_data);
   } else {
-    FinalizeImage(ToBitmap(favicon.image_data->front(),
-                           favicon.image_data->size()), request_id);
+    FinalizeImage(ToBitmap(bitmap_data->front(), bitmap_data->size()),
+                  request_id);
   }
 }
 
 void ExtensionIconSource::OnImageLoaded(const gfx::Image& image,
                                         const std::string& extension_id,
                                         int index) {
   int request_id = tracker_map_[index];
   tracker_map_.erase(tracker_map_.find(index));
 
   if (image.IsEmpty())
@@ skipping 84 matching lines @@
 
 void ExtensionIconSource::ClearData(int request_id) {
   std::map<int, ExtensionIconRequest*>::iterator i =
       request_map_.find(request_id);
   if (i == request_map_.end())
     return;
 
   delete i->second;
   request_map_.erase(i);
 }