wip

chrome/browser/sync/glue/session_model_associator.cc

Index: chrome/browser/sync/glue/session_model_associator.cc
diff --git a/chrome/browser/sync/glue/session_model_associator.cc b/chrome/browser/sync/glue/session_model_associator.cc
index 7a5034767d8b02e2ad08d18ff9df07ac4d3ba624..8fe3e15b51fc5b8c349395fd908f6863b9f64b32 100644
--- a/chrome/browser/sync/glue/session_model_associator.cc
+++ b/chrome/browser/sync/glue/session_model_associator.cc
@@ -600,12 +600,13 @@ void SessionModelAssociator::OnFaviconDataAvailable(
         tab_node.GetSessionSpecifics();
     DCHECK(session_specifics.has_tab());
     sync_pb::SessionTab* tab = session_specifics.mutable_tab();
-    if (favicon.bitmap_data->size() > 0) {
+    if (favicon.variants.size() > 0 &&
+        favicon.variants[0].bitmap_data->size() > 0) {
       DVLOG(1) << "Storing session favicon for "
                << tab_link->url() << " with size "
-               << favicon.bitmap_data->size() << " bytes.";
-      tab->set_favicon(favicon.bitmap_data->front(),
-                       favicon.bitmap_data->size());
+               << favicon.variants[0].bitmap_data->size() << " bytes.";
+      tab->set_favicon(favicon.variants[0].bitmap_data->front(),
+                       favicon.variants[0].bitmap_data->size());
       tab->set_favicon_type(sync_pb::SessionTab::TYPE_WEB_FAVICON);
       tab->set_favicon_source(favicon.icon_url.spec());
     } else {