wip

chrome/browser/ui/intents/web_intent_picker_controller.cc

Index: chrome/browser/ui/intents/web_intent_picker_controller.cc
diff --git a/chrome/browser/ui/intents/web_intent_picker_controller.cc b/chrome/browser/ui/intents/web_intent_picker_controller.cc
index 5def8f79041d0465e43a23300e7664930ceb7db5..7f0c4f6518cc0914dbfdee5fcb0bb78a3469545b 100644
--- a/chrome/browser/ui/intents/web_intent_picker_controller.cc
+++ b/chrome/browser/ui/intents/web_intent_picker_controller.cc
@@ -545,11 +545,11 @@ void WebIntentPickerController::RegistryCallsCompleted() {
 void WebIntentPickerController::OnFaviconDataAvailable(
     FaviconService::Handle handle, history::FaviconData favicon_data) {
   size_t index = favicon_consumer_.GetClientDataForCurrentRequest();
-  if (favicon_data.is_valid()) {
+  if (favicon_data.is_valid() && favicon_data.variants.size() > 0) {
     SkBitmap icon_bitmap;
 
-    if (gfx::PNGCodec::Decode(favicon_data.bitmap_data->front(),
-                              favicon_data.bitmap_data->size(),
+    if (gfx::PNGCodec::Decode(favicon_data.variants[0].bitmap_data->front(),
+                              favicon_data.variants[0].bitmap_data->size(),
                               &icon_bitmap)) {
       gfx::Image icon_image(icon_bitmap);
       picker_model_->UpdateFaviconAt(index, icon_image);