Adds support for saving favicon size into history database.

chrome/browser/history/android/android_provider_backend_unittest.cc

Index: chrome/browser/history/android/android_provider_backend_unittest.cc
diff --git a/chrome/browser/history/android/android_provider_backend_unittest.cc b/chrome/browser/history/android/android_provider_backend_unittest.cc
index f11d8df858306ff3f3a17419dc0615f0df75cb88..5d3d57f3e1265bcda7d86cfb9e3e1935c4ae05c9 100644
--- a/chrome/browser/history/android/android_provider_backend_unittest.cc
+++ b/chrome/browser/history/android/android_provider_backend_unittest.cc
@@ -49,6 +49,8 @@ struct BookmarkCacheRow {
   FaviconID favicon_id_;
 };
 
+const gfx::Size kFaviconRegularSize = gfx::Size(16, 16);
+
 }  // namespace
 
 class AndroidProviderBackendDelegate : public HistoryBackend::Delegate {
@@ -248,6 +250,7 @@ TEST_F(AndroidProviderBackendTest, UpdateTables) {
   history_backend->SetFavicon(url2,
                               GURL(),
                               new base::RefCountedBytes(data),
+                              kFaviconRegularSize,
                               FAVICON);
   history_backend->Closing();
   }
@@ -374,6 +377,7 @@ TEST_F(AndroidProviderBackendTest, QueryHistoryAndBookmarks) {
   history_backend->SetFavicon(url2,
                               GURL(),
                               new base::RefCountedBytes(data),
+                              kFaviconRegularSize,
                               FAVICON);
   history_backend->Closing();
   }
@@ -1125,13 +1129,14 @@ TEST_F(AndroidProviderBackendTest, UpdateFavicon) {
   ASSERT_TRUE(delegate_.favicon_details()->urls.end() !=
               delegate_.favicon_details()->urls.find(row1.url()));
 
-  IconMapping icon_mapping;
-  EXPECT_TRUE(thumbnail_db_.GetIconMappingForPageURL(row1.url(), FAVICON,
-                                                     &icon_mapping));
+  std::vector<IconMapping> icon_mappings;
+  EXPECT_TRUE(thumbnail_db_.GetIconMappingsForPageURL(row1.url(), FAVICON,
+                                                      &icon_mappings));
+  EXPECT_EQ(1u, icon_mappings.size());
   Time last_updated;
   std::vector<unsigned char> png_icon_data;
-  EXPECT_TRUE(thumbnail_db_.GetFavicon(icon_mapping.icon_id, &last_updated,
-                                       &png_icon_data, NULL, NULL));
+  EXPECT_TRUE(thumbnail_db_.GetFavicon(icon_mappings[0].icon_id, &last_updated,
+                                       &png_icon_data, NULL, NULL, NULL));
   EXPECT_EQ(data, png_icon_data);
 
   // Remove favicon.
@@ -1152,8 +1157,8 @@ TEST_F(AndroidProviderBackendTest, UpdateFavicon) {
   ASSERT_TRUE(delegate_.favicon_details()->urls.end() !=
               delegate_.favicon_details()->urls.find(row1.url()));
 
-  EXPECT_FALSE(thumbnail_db_.GetIconMappingForPageURL(row1.url(), FAVICON,
-                                                      NULL));
+  EXPECT_FALSE(thumbnail_db_.GetIconMappingsForPageURL(row1.url(), FAVICON,
+                                                       NULL));
 }
 
 TEST_F(AndroidProviderBackendTest, UpdateSearchTermTable) {