wip

chrome/browser/ui/toolbar/back_forward_menu_model.cc

Index: chrome/browser/ui/toolbar/back_forward_menu_model.cc
diff --git a/chrome/browser/ui/toolbar/back_forward_menu_model.cc b/chrome/browser/ui/toolbar/back_forward_menu_model.cc
index a5982223cbb5eda1b350a35681387a25ca1249e0..2961ceb038c116b8921c7366f4f55229867de7b2 100644
--- a/chrome/browser/ui/toolbar/back_forward_menu_model.cc
+++ b/chrome/browser/ui/toolbar/back_forward_menu_model.cc
@@ -278,8 +278,9 @@ void BackForwardMenuModel::OnFavIconDataAvailable(
     // Now that we have a valid NavigationEntry, decode the favicon and assign
     // it to the NavigationEntry.
     SkBitmap fav_icon;
-    if (gfx::PNGCodec::Decode(favicon.bitmap_data->front(),
-                              favicon.bitmap_data->size(),
+    if (favicon.variants.size() > 0 &&  // XXX
+        gfx::PNGCodec::Decode(favicon.variants[0].bitmap_data->front(),
+                              favicon.variants[0].bitmap_data->size(),
                               &fav_icon)) {
       entry->GetFavicon().valid = true;
       entry->GetFavicon().url = favicon.icon_url;