Adds support for saving favicon size into history database.

chrome/browser/history/thumbnail_database_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <algorithm>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
@@ skipping 28 matching lines @@
     "goiwuegrqrcomizqyzkjalitbahxfjytrqvpqeroicxmnlkhlzunacxaneviawrtxcywhgef";
 static const unsigned char blob3[] =
     "3716871354098370776510470746794707624107647054607467847164027";
 const double kBoringness = 0.25;
 const double kWorseBoringness = 0.50;
 const double kBetterBoringness = 0.10;
 const double kTotallyBoring = 1.0;
 
 const int64 kPage1 = 1234;
 
+const gfx::Size kFaviconRegularSize = gfx::Size(16, 16);
+const gfx::Size kFaviconLargeSize = gfx::Size(32, 32);
+
 }  // namespace
 
 class ThumbnailDatabaseTest : public testing::Test {
  public:
   ThumbnailDatabaseTest() {
   }
   ~ThumbnailDatabaseTest() {
   }
 
  protected:
@@ skipping 53 matching lines @@
 
 TEST_F(ThumbnailDatabaseTest, GetFaviconAfterMigrationToTopSites) {
   ThumbnailDatabase db;
   ASSERT_EQ(sql::INIT_OK, db.Init(file_name_, NULL, NULL));
   db.BeginTransaction();
 
   std::vector<unsigned char> data(blob1, blob1 + sizeof(blob1));
   scoped_refptr<base::RefCountedBytes> favicon(new base::RefCountedBytes(data));
 
   GURL url("http://google.com");
-  FaviconID id = db.AddFavicon(url, FAVICON);
+  FaviconID id = db.AddFavicon(url, kFaviconRegularSize, FAVICON);
   base::Time time = base::Time::Now();
   db.SetFavicon(id, favicon, time);
   EXPECT_TRUE(db.RenameAndDropThumbnails(file_name_, new_file_name_));
   EXPECT_TRUE(db.IsLatestVersion());
 
   base::Time time_out;
   std::vector<unsigned char> favicon_out;
   GURL url_out;
   IconType icon_type_out;
   EXPECT_TRUE(db.GetFavicon(id, &time_out, &favicon_out, &url_out,
-                            &icon_type_out));
+                            NULL, &icon_type_out));
   EXPECT_EQ(url, url_out);
   EXPECT_EQ(time.ToTimeT(), time_out.ToTimeT());
   ASSERT_EQ(data.size(), favicon_out.size());
   EXPECT_TRUE(std::equal(data.begin(),
                          data.end(),
                          favicon_out.begin()));
   EXPECT_EQ(FAVICON, icon_type_out);
 }
 
+TEST_F(ThumbnailDatabaseTest, GetFaviconIDsForURL) {
+  ThumbnailDatabase db;
+  ASSERT_EQ(sql::INIT_OK, db.Init(file_name_, NULL, NULL));
+  db.BeginTransaction();
+
+  std::vector<unsigned char> data(blob1, blob1 + sizeof(blob1));
+  scoped_refptr<base::RefCountedBytes> favicon(new base::RefCountedBytes(data));
+
+  GURL url("http://google.com");
+  base::Time time = base::Time::Now();
+
+  FaviconID id1 = db.AddFavicon(url, kFaviconRegularSize, FAVICON);
+  EXPECT_NE(0, id1);
+
+  FaviconID id2 = db.AddFavicon(url, kFaviconRegularSize, TOUCH_ICON);
+  EXPECT_NE(0, id2);
+
+  FaviconID id3 = db.AddFavicon(url, kFaviconRegularSize,
+                                TOUCH_PRECOMPOSED_ICON);
+  EXPECT_NE(0, id3);
+
+  FaviconID id4 = db.AddFavicon(url, kFaviconLargeSize,
+                                TOUCH_PRECOMPOSED_ICON);
+  EXPECT_NE(0, id4);
+
+  std::vector<FaviconIDAndSize> favicon_id_size_listing;
+  db.GetFaviconIDsForFaviconURL(url, TOUCH_ICON | TOUCH_PRECOMPOSED_ICON,
+                                &favicon_id_size_listing);
+  EXPECT_EQ(2u, favicon_id_size_listing.size());
+
+  // No required order for differently sized entries.
+  if (id3 == favicon_id_size_listing[0].icon_id) {
+    EXPECT_EQ(kFaviconRegularSize, favicon_id_size_listing[0].icon_size);
+    EXPECT_EQ(id4, favicon_id_size_listing[1].icon_id);
+    EXPECT_EQ(kFaviconLargeSize, favicon_id_size_listing[1].icon_size);
+  } else {
+    EXPECT_EQ(id3, favicon_id_size_listing[1].icon_id);
+    EXPECT_EQ(kFaviconRegularSize, favicon_id_size_listing[1].icon_size);
+    EXPECT_EQ(id4, favicon_id_size_listing[0].icon_id);
+    EXPECT_EQ(kFaviconLargeSize, favicon_id_size_listing[0].icon_size);
+  }
+}
+
 TEST_F(ThumbnailDatabaseTest, AddIconMapping) {
   ThumbnailDatabase db;
   ASSERT_EQ(sql::INIT_OK, db.Init(file_name_, NULL, NULL));
   db.BeginTransaction();
 
   std::vector<unsigned char> data(blob1, blob1 + sizeof(blob1));
   scoped_refptr<base::RefCountedBytes> favicon(new base::RefCountedBytes(data));
 
   GURL url("http://google.com");
-  FaviconID id = db.AddFavicon(url, TOUCH_ICON);
+  FaviconID id = db.AddFavicon(url, kFaviconRegularSize, TOUCH_ICON);
   EXPECT_NE(0, id);
   base::Time time = base::Time::Now();
   db.SetFavicon(id, favicon, time);
 
   EXPECT_NE(0, db.AddIconMapping(url, id));
   std::vector<IconMapping> icon_mapping;
   EXPECT_TRUE(db.GetIconMappingsForPageURL(url, &icon_mapping));
   EXPECT_EQ(1u, icon_mapping.size());
   EXPECT_EQ(url, icon_mapping.front().page_url);
   EXPECT_EQ(id, icon_mapping.front().icon_id);
 }
 
 TEST_F(ThumbnailDatabaseTest, UpdateIconMapping) {
   ThumbnailDatabase db;
   ASSERT_EQ(sql::INIT_OK, db.Init(file_name_, NULL, NULL));
   db.BeginTransaction();
 
   std::vector<unsigned char> data(blob1, blob1 + sizeof(blob1));
   scoped_refptr<base::RefCountedBytes> favicon(new base::RefCountedBytes(data));
 
   GURL url("http://google.com");
-  FaviconID id = db.AddFavicon(url, TOUCH_ICON);
+  FaviconID id = db.AddFavicon(url, kFaviconRegularSize, TOUCH_ICON);
   base::Time time = base::Time::Now();
   db.SetFavicon(id, favicon, time);
 
   EXPECT_TRUE(0 < db.AddIconMapping(url, id));
   std::vector<IconMapping> icon_mapping;
   EXPECT_TRUE(db.GetIconMappingsForPageURL(url, &icon_mapping));
   ASSERT_EQ(1u, icon_mapping.size());
   EXPECT_EQ(url, icon_mapping.front().page_url);
   EXPECT_EQ(id, icon_mapping.front().icon_id);
 
   GURL url1("http://www.google.com/");
-  FaviconID new_id = db.AddFavicon(url1, TOUCH_ICON);
+  FaviconID new_id = db.AddFavicon(url1, kFaviconRegularSize, TOUCH_ICON);
   EXPECT_TRUE(db.UpdateIconMapping(icon_mapping.front().mapping_id, new_id));
 
   icon_mapping.clear();
   EXPECT_TRUE(db.GetIconMappingsForPageURL(url, &icon_mapping));
   ASSERT_EQ(1u, icon_mapping.size());
   EXPECT_EQ(url, icon_mapping.front().page_url);
   EXPECT_EQ(new_id, icon_mapping.front().icon_id);
   EXPECT_NE(id, icon_mapping.front().icon_id);
 }
 
 TEST_F(ThumbnailDatabaseTest, DeleteIconMappings) {
   ThumbnailDatabase db;
   ASSERT_EQ(sql::INIT_OK, db.Init(file_name_, NULL, NULL));
   db.BeginTransaction();
 
   std::vector<unsigned char> data(blob1, blob1 + sizeof(blob1));
   scoped_refptr<base::RefCountedBytes> favicon(new base::RefCountedBytes(data));
 
   GURL url("http://google.com");
-  FaviconID id = db.AddFavicon(url, TOUCH_ICON);
+  FaviconID id = db.AddFavicon(url, kFaviconRegularSize, TOUCH_ICON);
   base::Time time = base::Time::Now();
   db.SetFavicon(id, favicon, time);
   EXPECT_TRUE(0 < db.AddIconMapping(url, id));
 
-  FaviconID id2 = db.AddFavicon(url, FAVICON);
+  FaviconID id2 = db.AddFavicon(url, kFaviconRegularSize, FAVICON);
   db.SetFavicon(id2, favicon, time);
   EXPECT_TRUE(0 < db.AddIconMapping(url, id2));
   ASSERT_NE(id, id2);
 
   std::vector<IconMapping> icon_mapping;
   EXPECT_TRUE(db.GetIconMappingsForPageURL(url, &icon_mapping));
   ASSERT_EQ(2u, icon_mapping.size());
   EXPECT_EQ(icon_mapping.front().icon_type, TOUCH_ICON);
-  EXPECT_TRUE(db.GetIconMappingForPageURL(url, FAVICON, NULL));
+  EXPECT_TRUE(db.GetIconMappingsForPageURL(url, FAVICON, NULL));
 
   db.DeleteIconMappings(url);
 
   EXPECT_FALSE(db.GetIconMappingsForPageURL(url, NULL));
-  EXPECT_FALSE(db.GetIconMappingForPageURL(url, FAVICON, NULL));
+  EXPECT_FALSE(db.GetIconMappingsForPageURL(url, FAVICON, NULL));
 }
 
 TEST_F(ThumbnailDatabaseTest, GetIconMappingsForPageURL) {
   ThumbnailDatabase db;
   ASSERT_EQ(sql::INIT_OK, db.Init(file_name_, NULL, NULL));
   db.BeginTransaction();
 
   std::vector<unsigned char> data(blob1, blob1 + sizeof(blob1));
   scoped_refptr<base::RefCountedBytes> favicon(new base::RefCountedBytes(data));
 
   GURL url("http://google.com");
 
-  FaviconID id1 = db.AddFavicon(url, TOUCH_ICON);
+  FaviconID id1 = db.AddFavicon(url, kFaviconRegularSize, TOUCH_ICON);
   base::Time time = base::Time::Now();
   db.SetFavicon(id1, favicon, time);
   EXPECT_TRUE(0 < db.AddIconMapping(url, id1));
 
-  FaviconID id2 = db.AddFavicon(url, FAVICON);
+  FaviconID id2 = db.AddFavicon(url, kFaviconRegularSize, FAVICON);
   EXPECT_NE(id1, id2);
   db.SetFavicon(id2, favicon, time);
   EXPECT_TRUE(0 < db.AddIconMapping(url, id2));
 
-  std::vector<IconMapping> icon_mapping;
-  EXPECT_TRUE(db.GetIconMappingsForPageURL(url, &icon_mapping));
-  ASSERT_EQ(2u, icon_mapping.size());
-  EXPECT_NE(icon_mapping[0].icon_id, icon_mapping[1].icon_id);
-  EXPECT_TRUE(icon_mapping[0].icon_id == id1 && icon_mapping[1].icon_id == id2);
+  FaviconID id3 = db.AddFavicon(url, kFaviconLargeSize, FAVICON);
+  EXPECT_NE(id3, id1);
+  EXPECT_NE(id3, id2);
+  db.SetFavicon(id3, favicon, time);
+  EXPECT_TRUE(0 < db.AddIconMapping(url, id3));
+
+  std::vector<IconMapping> icon_mappings;
+  EXPECT_TRUE(db.GetIconMappingsForPageURL(url, &icon_mappings));
+  ASSERT_EQ(3u, icon_mappings.size());
+  EXPECT_EQ(id1, icon_mappings[0].icon_id);
+
+  // No required order for differently sized entries.
+  if (id2 == icon_mappings[1].icon_id) {
+    EXPECT_EQ(id3, icon_mappings[2].icon_id);
+  } else {
+    EXPECT_EQ(id2, icon_mappings[2].icon_id);
+    EXPECT_EQ(id3, icon_mappings[1].icon_id);
+  }
+
+  icon_mappings.clear();
+  EXPECT_TRUE(db.GetIconMappingsForPageURL(url, FAVICON, &icon_mappings));
+  ASSERT_EQ(2u, icon_mappings.size());
+  // No required order for differently sized entries.
+  if (id2 == icon_mappings[0].icon_id) {
+    EXPECT_EQ(id3, icon_mappings[1].icon_id);
+  } else {
+    EXPECT_EQ(id2, icon_mappings[1].icon_id);
+    EXPECT_EQ(id3, icon_mappings[0].icon_id);
+  }
 }
 
 TEST_F(ThumbnailDatabaseTest, UpgradeToVersion4) {
   ThumbnailDatabase db;
   ASSERT_EQ(sql::INIT_OK, db.Init(file_name_, NULL, NULL));
   db.BeginTransaction();
 
   const char* name = "favicons";
   std::string sql;
   sql.append("DROP TABLE IF EXISTS ");
@@ skipping 116 matching lines @@
   ASSERT_EQ(sql::INIT_OK, db.Init(file_name_, NULL, NULL));
 
   db.BeginTransaction();
 
   EXPECT_TRUE(db.InitTemporaryIconMappingTable());
 
   std::vector<unsigned char> data(blob1, blob1 + sizeof(blob1));
   scoped_refptr<base::RefCountedBytes> favicon(new base::RefCountedBytes(data));
 
   GURL url("http://google.com");
-  FaviconID id = db.AddFavicon(url, FAVICON);
+  FaviconID id = db.AddFavicon(url, kFaviconRegularSize, FAVICON);
   base::Time time = base::Time::Now();
   db.SetFavicon(id, favicon, time);
 
   db.AddToTemporaryIconMappingTable(url, id);
   db.CommitTemporaryIconMappingTable();
-  IconMapping icon_mapping;
-  EXPECT_TRUE(db.GetIconMappingForPageURL(url, FAVICON, &icon_mapping));
-  EXPECT_EQ(id, icon_mapping.icon_id);
-  EXPECT_EQ(url, icon_mapping.page_url);
+  std::vector<IconMapping> icon_mappings;
+  EXPECT_TRUE(db.GetIconMappingsForPageURL(url, FAVICON, &icon_mappings));
+  EXPECT_EQ(1u, icon_mappings.size());
+  EXPECT_EQ(id, icon_mappings[0].icon_id);
+  EXPECT_EQ(url, icon_mappings[0].page_url);
+  EXPECT_EQ(kFaviconRegularSize, icon_mappings[0].icon_pixel_size);
 }
 
 TEST_F(ThumbnailDatabaseTest, GetIconMappingsForPageURLForReturnOrder) {
   ThumbnailDatabase db;
   ASSERT_EQ(sql::INIT_OK, db.Init(file_name_, NULL, NULL));
   db.BeginTransaction();
 
   // Add a favicon
   std::vector<unsigned char> data(blob1, blob1 + sizeof(blob1));
   scoped_refptr<base::RefCountedBytes> favicon(new base::RefCountedBytes(data));
 
   GURL url("http://google.com");
-  FaviconID id = db.AddFavicon(url, FAVICON);
+  FaviconID id = db.AddFavicon(url, kFaviconRegularSize, FAVICON);
   base::Time time = base::Time::Now();
   db.SetFavicon(id, favicon, time);
 
   EXPECT_NE(0, db.AddIconMapping(url, id));
   std::vector<IconMapping> icon_mapping;
   EXPECT_TRUE(db.GetIconMappingsForPageURL(url, &icon_mapping));
 
   EXPECT_EQ(url, icon_mapping.front().page_url);
   EXPECT_EQ(id, icon_mapping.front().icon_id);
   EXPECT_EQ(FAVICON, icon_mapping.front().icon_type);
 
   // Add a touch icon
   std::vector<unsigned char> data2(blob2, blob2 + sizeof(blob2));
   scoped_refptr<base::RefCountedBytes> favicon2 =
       new base::RefCountedBytes(data);
 
-  FaviconID id2 = db.AddFavicon(url, TOUCH_ICON);
+  FaviconID id2 = db.AddFavicon(url, kFaviconRegularSize, TOUCH_ICON);
   db.SetFavicon(id2, favicon2, time);
   EXPECT_NE(0, db.AddIconMapping(url, id2));
 
   icon_mapping.clear();
   EXPECT_TRUE(db.GetIconMappingsForPageURL(url, &icon_mapping));
 
   EXPECT_EQ(url, icon_mapping.front().page_url);
   EXPECT_EQ(id2, icon_mapping.front().icon_id);
   EXPECT_EQ(TOUCH_ICON, icon_mapping.front().icon_type);
 
   // Add a touch precomposed icon
   scoped_refptr<base::RefCountedBytes> favicon3 =
       new base::RefCountedBytes(data2);
 
-  FaviconID id3 = db.AddFavicon(url, TOUCH_PRECOMPOSED_ICON);
+  FaviconID id3 = db.AddFavicon(url, kFaviconRegularSize,
+                                TOUCH_PRECOMPOSED_ICON);
   db.SetFavicon(id3, favicon3, time);
   EXPECT_NE(0, db.AddIconMapping(url, id3));
 
   icon_mapping.clear();
   EXPECT_TRUE(db.GetIconMappingsForPageURL(url, &icon_mapping));
 
   EXPECT_EQ(url, icon_mapping.front().page_url);
   EXPECT_EQ(id3, icon_mapping.front().icon_id);
   EXPECT_EQ(TOUCH_PRECOMPOSED_ICON, icon_mapping.front().icon_type);
 }
 
 TEST_F(ThumbnailDatabaseTest, HasMappingFor) {
   ThumbnailDatabase db;
   ASSERT_EQ(sql::INIT_OK, db.Init(file_name_, NULL, NULL));
   db.BeginTransaction();
 
   std::vector<unsigned char> data(blob1, blob1 + sizeof(blob1));
   scoped_refptr<base::RefCountedBytes> favicon(new base::RefCountedBytes(data));
 
   // Add a favicon which will have icon_mappings
-  FaviconID id1 = db.AddFavicon(GURL("http://google.com"), FAVICON);
+  FaviconID id1 = db.AddFavicon(GURL("http://google.com"), kFaviconRegularSize,
+                                FAVICON);
   EXPECT_NE(id1, 0);
   base::Time time = base::Time::Now();
   db.SetFavicon(id1, favicon, time);
 
   // Add another type of favicon
-  FaviconID id2 = db.AddFavicon(GURL("http://www.google.com/icon"), TOUCH_ICON);
+  FaviconID id2 = db.AddFavicon(GURL("http://www.google.com/icon"),
+                                kFaviconRegularSize, TOUCH_ICON);
   EXPECT_NE(id2, 0);
   time = base::Time::Now();
   db.SetFavicon(id2, favicon, time);
 
   // Add 3rd favicon
-  FaviconID id3 = db.AddFavicon(GURL("http://www.google.com/icon"), TOUCH_ICON);
+  FaviconID id3 = db.AddFavicon(GURL("http://www.google.com/icon"),
+                                kFaviconRegularSize, TOUCH_ICON);
   EXPECT_NE(id3, 0);
   time = base::Time::Now();
   db.SetFavicon(id3, favicon, time);
 
   // Add 2 icon mapping
   GURL page_url("http://www.google.com");
   EXPECT_TRUE(db.AddIconMapping(page_url, id1));
   EXPECT_TRUE(db.AddIconMapping(page_url, id2));
 
   EXPECT_TRUE(db.HasMappingFor(id1));
   EXPECT_TRUE(db.HasMappingFor(id2));
   EXPECT_FALSE(db.HasMappingFor(id3));
 
   // Remove all mappings
   db.DeleteIconMappings(page_url);
   EXPECT_FALSE(db.HasMappingFor(id1));
   EXPECT_FALSE(db.HasMappingFor(id2));
   EXPECT_FALSE(db.HasMappingFor(id3));
 }
 
 TEST_F(ThumbnailDatabaseTest, CloneIconMapping) {
   ThumbnailDatabase db;
   ASSERT_EQ(sql::INIT_OK, db.Init(file_name_, NULL, NULL));
   db.BeginTransaction();
 
   std::vector<unsigned char> data(blob1, blob1 + sizeof(blob1));
   scoped_refptr<base::RefCountedBytes> favicon(new base::RefCountedBytes(data));
 
   // Add a favicon which will have icon_mappings
-  FaviconID id1 = db.AddFavicon(GURL("http://google.com"), FAVICON);
+  FaviconID id1 = db.AddFavicon(GURL("http://google.com"), kFaviconRegularSize,
+                                FAVICON);
   EXPECT_NE(0, id1);
   base::Time time = base::Time::Now();
   db.SetFavicon(id1, favicon, time);
 
   // Add another type of favicon
-  FaviconID id2 = db.AddFavicon(GURL("http://www.google.com/icon"), TOUCH_ICON);
+  FaviconID id2 = db.AddFavicon(GURL("http://www.google.com/icon"),
+                                kFaviconRegularSize, TOUCH_ICON);
   EXPECT_NE(0, id2);
   time = base::Time::Now();
   db.SetFavicon(id2, favicon, time);
 
   // Add 3rd favicon
-  FaviconID id3 = db.AddFavicon(GURL("http://www.google.com/icon"), TOUCH_ICON);
+  FaviconID id3 = db.AddFavicon(GURL("http://www.google.com/icon"),
+                                kFaviconRegularSize, TOUCH_ICON);
   EXPECT_NE(0, id3);
   time = base::Time::Now();
   db.SetFavicon(id3, favicon, time);
 
   GURL page1_url("http://page1.com");
   EXPECT_TRUE(db.AddIconMapping(page1_url, id1));
   EXPECT_TRUE(db.AddIconMapping(page1_url, id2));
 
   GURL page2_url("http://page2.com");
   EXPECT_TRUE(db.AddIconMapping(page2_url, id3));
@@ skipping 45 matching lines @@
   std::vector<IconMapping> icon_mappings;
   EXPECT_TRUE(db.GetIconMappingsForPageURL(page_url1, &icon_mappings));
   ASSERT_EQ(1u, icon_mappings.size());
   EXPECT_EQ(FAVICON, icon_mappings[0].icon_type);
   EXPECT_EQ(page_url1, icon_mappings[0].page_url);
   EXPECT_EQ(1, icon_mappings[0].icon_id);
   base::Time time;
   std::vector<unsigned char> out_data;
   GURL out_icon_url;
   ASSERT_TRUE(db.GetFavicon(
-      icon_mappings[0].icon_id, &time, &out_data, &out_icon_url, NULL));
+      icon_mappings[0].icon_id, &time, &out_data, &out_icon_url, NULL, NULL));
   EXPECT_EQ(icon1, out_icon_url);
 
   // Test a page which has the same icon.
   GURL page_url3 = GURL("http://www.google.com/");
   icon_mappings.clear();
   EXPECT_TRUE(db.GetIconMappingsForPageURL(page_url3, &icon_mappings));
   ASSERT_EQ(1u, icon_mappings.size());
   EXPECT_EQ(FAVICON, icon_mappings[0].icon_type);
   EXPECT_EQ(page_url3, icon_mappings[0].page_url);
   EXPECT_EQ(1, icon_mappings[0].icon_id);
 
   // Test a icon_mapping with different IconID.
   GURL page_url2 = GURL("http://yahoo.com/");
   icon_mappings.clear();
   EXPECT_TRUE(db.GetIconMappingsForPageURL(page_url2, &icon_mappings));
   ASSERT_EQ(1u, icon_mappings.size());
   EXPECT_EQ(FAVICON, icon_mappings[0].icon_type);
   EXPECT_EQ(page_url2, icon_mappings[0].page_url);
   EXPECT_EQ(2, icon_mappings[0].icon_id);
   ASSERT_TRUE(db.GetFavicon(
-      icon_mappings[0].icon_id, &time, &out_data, &out_icon_url, NULL));
+      icon_mappings[0].icon_id, &time, &out_data, &out_icon_url, NULL, NULL));
   EXPECT_EQ(icon2, out_icon_url);
 
   // Test a page without icon
   GURL page_url4 = GURL("http://www.google.com/blank.html");
   EXPECT_FALSE(db.GetIconMappingsForPageURL(page_url4, NULL));
 }
 
 TEST_F(ThumbnailDatabaseTest, IconMappingEnumerator) {
   ThumbnailDatabase db;
   ASSERT_EQ(sql::INIT_OK, db.Init(file_name_, NULL, NULL));
   db.BeginTransaction();
 
   std::vector<unsigned char> data(blob1, blob1 + sizeof(blob1));
   scoped_refptr<base::RefCountedBytes> favicon(new base::RefCountedBytes(data));
 
   GURL url("http://google.com");
-  FaviconID touch_icon_id1 = db.AddFavicon(url, TOUCH_ICON);
+  FaviconID touch_icon_id1 = db.AddFavicon(url, kFaviconRegularSize,
+                                           TOUCH_ICON);
   ASSERT_NE(0, touch_icon_id1);
   ASSERT_TRUE(db.SetFavicon(touch_icon_id1, favicon, base::Time::Now()));
   IconMappingID touch_mapping_id1 = db.AddIconMapping(url, touch_icon_id1);
   ASSERT_NE(0, touch_mapping_id1);
 
-  FaviconID favicon_id1 = db.AddFavicon(url, FAVICON);
+  FaviconID favicon_id1 = db.AddFavicon(url, kFaviconRegularSize, FAVICON);
   ASSERT_NE(0, favicon_id1);
   ASSERT_TRUE(db.SetFavicon(favicon_id1, favicon, base::Time::Now()));
   IconMappingID favicon_mapping_id1 = db.AddIconMapping(url, favicon_id1);
   ASSERT_NE(0, favicon_mapping_id1);
 
   GURL url2("http://chromium.org");
-  FaviconID favicon_id2 = db.AddFavicon(url2, FAVICON);
+  FaviconID favicon_id2 = db.AddFavicon(url2, kFaviconLargeSize, FAVICON);
   ASSERT_NE(0, favicon_id2);
   ASSERT_TRUE(db.SetFavicon(favicon_id2, favicon, base::Time::Now()));
   IconMappingID favicon_mapping_id2 = db.AddIconMapping(url2, favicon_id2);
   ASSERT_NE(0, favicon_mapping_id2);
 
   IconMapping icon_mapping;
   ThumbnailDatabase::IconMappingEnumerator enumerator1;
   ASSERT_TRUE(db.InitIconMappingEnumerator(FAVICON, &enumerator1));
   // There are 2 favicon mappings.
   bool has_favicon_mapping1 = false;
@@ skipping 22 matching lines @@
   ASSERT_TRUE(enumerator2.GetNextIconMapping(&icon_mapping));
   EXPECT_EQ(touch_mapping_id1, icon_mapping.mapping_id);
   EXPECT_EQ(url, icon_mapping.page_url);
   EXPECT_EQ(touch_icon_id1, icon_mapping.icon_id);
   EXPECT_EQ(TOUCH_ICON, icon_mapping.icon_type);
 
   EXPECT_FALSE(enumerator2.GetNextIconMapping(&icon_mapping));
 }
 
 }  // namespace history