Index: chrome/browser/history/android/android_provider_backend.cc |
diff --git a/chrome/browser/history/android/android_provider_backend.cc b/chrome/browser/history/android/android_provider_backend.cc |
index fec1cdbcb2a341d4964d7c954483ef25976afc9b..847a6c5d33cfbd8493823adba6a0970973a59e58 100644 |
--- a/chrome/browser/history/android/android_provider_backend.cc |
+++ b/chrome/browser/history/android/android_provider_backend.cc |
@@ -966,11 +966,11 @@ bool AndroidProviderBackend::SimulateUpdateURL( |
FaviconID favicon_id = statement->statement()->ColumnInt64(4); |
if (favicon_id) { |
- std::vector<unsigned char> favicon; |
- if (!thumbnail_db_->GetFavicon(favicon_id, NULL, &favicon, NULL, NULL)) |
+ std::vector<FaviconBitmap> favicon_bitmaps; |
+ if (!thumbnail_db_->GetFavicons(favicon_id, &favicon_bitmaps)) |
return false; |
- if (!favicon.empty()) |
- new_row.set_favicon(favicon); |
+ if (favicon_bitmaps[0].bitmap_data->size() > 0) |
+ new_row.set_favicon(favicon_bitmaps[0].bitmap_data); |
favicon_details->urls.insert(old_url_row.url()); |
favicon_details->urls.insert(row.url()); |
} |