wip

chrome/browser/ui/cocoa/history_menu_bridge.mm

Index: chrome/browser/ui/cocoa/history_menu_bridge.mm
diff --git a/chrome/browser/ui/cocoa/history_menu_bridge.mm b/chrome/browser/ui/cocoa/history_menu_bridge.mm
index d6120a2f3d4712ddf21a9a4b24d978b700e9ae7e..9128dec8dfce7be60c3567cbe6a71016a53ad606 100644
--- a/chrome/browser/ui/cocoa/history_menu_bridge.mm
+++ b/chrome/browser/ui/cocoa/history_menu_bridge.mm
@@ -470,9 +470,9 @@ void HistoryMenuBridge::GotFaviconData(FaviconService::Handle handle,
   // Convert the raw data to Skia and then to a NSImage.
   // TODO(rsesek): Is there an easier way to do this?
   SkBitmap icon;
-  if (favicon.is_valid() &&
-      gfx::PNGCodec::Decode(favicon.bitmap_data->front(),
-          favicon.bitmap_data->size(), &icon)) {
+  if (favicon.is_valid() && favicon.variants.size() > 0 &&
+      gfx::PNGCodec::Decode(favicon.variants[0].bitmap_data->front(),
+          favicon.variants[0].bitmap_data->size(), &icon)) {
     NSImage* image = gfx::SkBitmapToNSImage(icon);
     if (image) {
       // The conversion was successful.