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

chrome/browser/ui/intents/web_intent_picker_controller.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/intents/web_intent_picker_controller.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 560 matching lines @@
       InvokeService(*default_service);
       return;
     }
   }
 
   OnPickerEvent(kPickerEventRegistryDataComplete);
   OnIntentDataArrived();
 }
 
 void WebIntentPickerController::OnFaviconDataAvailable(
-    FaviconService::Handle handle, history::FaviconData favicon_data) {
+    FaviconService::Handle handle,
+    history::FaviconData favicon_data,
+    std::vector<GURL> icon_urls_in_db) {
   size_t index = favicon_consumer_.GetClientDataForCurrentRequest();
-  if (favicon_data.is_valid()) {
+  if (favicon_data.has_valid_bitmaps()) {
     SkBitmap icon_bitmap;
 
-    if (gfx::PNGCodec::Decode(favicon_data.image_data->front(),
-                              favicon_data.image_data->size(),
+    scoped_refptr<base::RefCountedMemory> bitmap_data(
+        favicon_data.first_bitmap());
+    if (gfx::PNGCodec::Decode(bitmap_data->front(), bitmap_data->size(),
                               &icon_bitmap)) {
       gfx::Image icon_image(icon_bitmap);
       picker_model_->UpdateFaviconAt(index, icon_image);
       return;
     }
   }
 
   AsyncOperationFinished();
 }
 
@@ skipping 289 matching lines @@
   picker_->SetActionString(GetIntentActionString(
       UTF16ToUTF8(picker_model_->action())));
   picker_shown_ = true;
 }
 
 void WebIntentPickerController::ClosePicker() {
   SetDialogState(kPickerHidden);
   if (picker_)
     picker_->Close();
 }