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

chrome/browser/ui/webui/favicon_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/favicon_source.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 112 matching lines @@
 }
 
 bool FaviconSource::ShouldReplaceExistingSource() const {
   // Leave the existing DataSource in place, otherwise we'll drop any pending
   // requests on the floor.
   return false;
 }
 
 void FaviconSource::OnFaviconDataAvailable(
     FaviconService::Handle request_handle,
-    history::FaviconData favicon) {
+    history::FaviconData favicon_data,
+    std::vector<GURL> icon_urls_in_db) {
   FaviconService* favicon_service =
       profile_->GetFaviconService(Profile::EXPLICIT_ACCESS);
   int request_id = cancelable_consumer_.GetClientData(favicon_service,
                                                       request_handle);
 
-  if (favicon.is_valid()) {
+  if (favicon_data.has_valid_bitmaps()) {
     // Forward the data along to the networking system.
-    SendResponse(request_id, favicon.image_data);
+    SendResponse(request_id, favicon_data.first_bitmap());
   } else {
     SendDefaultResponse(request_id);
   }
 }
 
 void FaviconSource::SendDefaultResponse(int request_id) {
   base::RefCountedMemory* bytes = NULL;
   if (request_size_map_[request_id] == 32) {
     if (!default_favicon_large_.get()) {
       default_favicon_large_ =
           ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
               IDR_DEFAULT_LARGE_FAVICON, ui::SCALE_FACTOR_100P);
     }
     bytes = default_favicon_large_;
   } else {
     if (!default_favicon_.get()) {
       default_favicon_ =
           ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
               IDR_DEFAULT_FAVICON, ui::SCALE_FACTOR_100P);
     }
     bytes = default_favicon_;
   }
   request_size_map_.erase(request_id);
 
   SendResponse(request_id, bytes);
 }