wip

chrome/browser/bookmarks/bookmark_model.cc

Index: chrome/browser/bookmarks/bookmark_model.cc
diff --git a/chrome/browser/bookmarks/bookmark_model.cc b/chrome/browser/bookmarks/bookmark_model.cc
index 5aa795ac8fb1938c9d27cc77067bfab323505eb2..27631f47c78274db8b14e4f9a77b5f5fe8085012 100644
--- a/chrome/browser/bookmarks/bookmark_model.cc
+++ b/chrome/browser/bookmarks/bookmark_model.cc
@@ -777,10 +777,10 @@ void BookmarkModel::OnFaviconDataAvailable(
           profile_->GetFaviconService(Profile::EXPLICIT_ACCESS), handle);
   DCHECK(node);
   node->set_favicon_load_handle(0);
-  if (favicon.is_valid()) {
+  if (favicon.is_valid() && favicon.variants.size() > 0) {
     scoped_ptr<gfx::Image> favicon_image(
-        gfx::ImageFromPNGEncodedData(favicon.bitmap_data->front(),
-                                     favicon.bitmap_data->size()));
+        gfx::ImageFromPNGEncodedData(favicon.variants[0].bitmap_data->front(),
+                                     favicon.variants[0].bitmap_data->size()));
     if (favicon_image.get()) {
       node->set_favicon(*favicon_image.get());
       FaviconLoaded(node);