Changes favicon database to support storing bitmaps of different sizes for the same icon_url

chrome/browser/history/android/android_provider_backend.cc

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 8957be6f77fd07d065ee17a11e414030d4e443a3..60ed1e3bf5d5a7c398a76b08ca9f0facd9945c9d 100644
--- a/chrome/browser/history/android/android_provider_backend.cc
+++ b/chrome/browser/history/android/android_provider_backend.cc
@@ -966,11 +966,10 @@ bool AndroidProviderBackend::SimulateUpdateURL(
 
   FaviconID favicon_id = statement->statement()->ColumnInt64(4);
   if (favicon_id) {
-    scoped_refptr<base::RefCountedBytes> favicon = new base::RefCountedBytes();
-    if (!thumbnail_db_->GetFavicon(favicon_id, NULL, &favicon->data(), NULL,
-                                   NULL))
+    scoped_refptr<base::RefCountedMemory> favicon;
+    if (!thumbnail_db_->GetFavicon(favicon_id, NULL, &favicon, NULL, NULL))
       return false;
-    if (favicon->size())
+    if (favicon.get() && favicon->size())
       new_row.set_favicon(favicon);
     favicon_details->urls.insert(old_url_row.url());
     favicon_details->urls.insert(row.url());