Adds support for saving favicon size into history database.

chrome/browser/history/expire_history_backend_unittest.cc

Index: chrome/browser/history/expire_history_backend_unittest.cc
diff --git a/chrome/browser/history/expire_history_backend_unittest.cc b/chrome/browser/history/expire_history_backend_unittest.cc
index 1a8a21ac783076760c15f359fda55d375167b830..2a1c97a15bb23016cc68439cd345955228e3d8a5 100644
--- a/chrome/browser/history/expire_history_backend_unittest.cc
+++ b/chrome/browser/history/expire_history_backend_unittest.cc
@@ -319,15 +319,17 @@ void ExpireHistoryTest::AddExampleSourceData(const GURL& url, URLID* id) {
 bool ExpireHistoryTest::HasFavicon(FaviconID favicon_id) {
   if (!thumb_db_.get() || favicon_id == 0)
     return false;
-  GURL icon_url;
-  return thumb_db_->GetFaviconHeader(favicon_id, &icon_url, NULL, NULL);
+  return thumb_db_->GetFaviconHeader(favicon_id, NULL, NULL, NULL);
 }
 
 FaviconID ExpireHistoryTest::GetFavicon(const GURL& page_url,
                                         IconType icon_type) {
-  IconMapping icon_mapping;
-  thumb_db_->GetIconMappingForPageURL(page_url, icon_type, &icon_mapping);
-  return icon_mapping.icon_id;
+  std::vector<IconMapping> icon_mappings;
+  if (thumb_db_->GetIconMappingsForPageURL(page_url, icon_type,
+                                           &icon_mappings)) {
+    return icon_mappings[0].icon_id;
+  }
+  return 0;
 }
 
 bool ExpireHistoryTest::HasThumbnail(URLID url_id) {