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

chrome/browser/history/android/favicon_sql_handler.cc

Index: chrome/browser/history/android/favicon_sql_handler.cc
diff --git a/chrome/browser/history/android/favicon_sql_handler.cc b/chrome/browser/history/android/favicon_sql_handler.cc
index b52aef421d29f906d1d53f17511928bf7506d07d..02ba83ccd0fd86bbf4acba805b41501ce3d733d1 100644
--- a/chrome/browser/history/android/favicon_sql_handler.cc
+++ b/chrome/browser/history/android/favicon_sql_handler.cc
@@ -41,7 +41,7 @@ bool FaviconSQLHandler::Update(const HistoryAndBookmarkRow& row,
 
     scoped_refptr<base::RefCountedMemory> image_data =
         new base::RefCountedBytes(row.favicon());
-    if (!thumbnail_db_->SetFavicon(favicon_id, image_data, Time::Now()))
+    if (!thumbnail_db_->AddFaviconFrame(favicon_id, image_data, Time::Now()))
       return false;
   }
 
@@ -117,7 +117,7 @@ bool FaviconSQLHandler::Insert(HistoryAndBookmarkRow* row) {
 
   scoped_refptr<base::RefCountedMemory> image_data =
       new base::RefCountedBytes(row->favicon());
-  if (!thumbnail_db_->SetFavicon(id, image_data, Time::Now()))
+  if (!thumbnail_db_->AddFaviconFrame(id, image_data, Time::Now()))
     return false;
   return thumbnail_db_->AddIconMapping(row->url(), id);
 }