Cleanup thumbnail database part #2

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 52 matching lines @@
     // Get a temporary directory for the test DB files.
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
 
     file_name_ = temp_dir_.path().AppendASCII("TestThumbnails.db");
     new_file_name_ = temp_dir_.path().AppendASCII("TestFavicons.db");
     history_db_name_ = temp_dir_.path().AppendASCII("TestHistory.db");
     google_bitmap_.reset(
         gfx::JPEGCodec::Decode(kGoogleThumbnail, sizeof(kGoogleThumbnail)));
   }
 
-  const FaviconSizes& GetFaviconSizesSmallAndLarge() {
-    CR_DEFINE_STATIC_LOCAL(FaviconSizes, kSizesSmallAndLarge, ());
-    if (kSizesSmallAndLarge.empty()) {
-      kSizesSmallAndLarge.push_back(kSmallSize);
-      kSizesSmallAndLarge.push_back(kLargeSize);
-    }
-    return kSizesSmallAndLarge;
+  const FaviconSizes GetFaviconSizesSmallAndLarge() {
+    FaviconSizes sizes_small_and_large;
+    sizes_small_and_large.push_back(kSmallSize);
+    sizes_small_and_large.push_back(kLargeSize);
+    return sizes_small_and_large;
   }
 
   scoped_ptr<SkBitmap> google_bitmap_;
 
   ScopedTempDir temp_dir_;
   FilePath file_name_;
   FilePath new_file_name_;
   FilePath history_db_name_;
 };
 
@@ skipping 34 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 icon_id = db.AddFavicon(url, FAVICON);
-  db.SetFaviconSizes(icon_id, GetFaviconSizesSmallAndLarge());
+  FaviconID icon_id = db.AddFavicon(url, FAVICON,
+                                    GetFaviconSizesSmallAndLarge());
   base::Time time = base::Time::Now();
   FaviconBitmapID bitmap1_id = db.AddFaviconBitmap(icon_id, favicon, time,
                                                    kSmallSize);
   FaviconBitmapID bitmap2_id = db.AddFaviconBitmap(icon_id, favicon, time,
                                                    kLargeSize);
   EXPECT_TRUE(db.RenameAndDropThumbnails(file_name_, new_file_name_));
   EXPECT_TRUE(db.IsLatestVersion());
 
   GURL url_out;
   IconType icon_type_out;
@@ skipping 42 matching lines @@
 
 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);
+  base::Time time = base::Time::Now();
+  FaviconID id = db.AddFavicon(url, TOUCH_ICON, GetDefaultFaviconSizes(),
+                               favicon, time, gfx::Size());
   EXPECT_NE(0, id);
-  base::Time time = base::Time::Now();
-  db.AddFaviconBitmap(id, favicon, time, gfx::Size());
 
   EXPECT_NE(0, db.AddIconMapping(url, id));
   std::vector<IconMapping> icon_mappings;
   EXPECT_TRUE(db.GetIconMappingsForPageURL(url, &icon_mappings));
   EXPECT_EQ(1u, icon_mappings.size());
   EXPECT_EQ(url, icon_mappings.front().page_url);
   EXPECT_EQ(id, icon_mappings.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);
-  base::Time time = base::Time::Now();
-  db.AddFaviconBitmap(id, favicon, time, gfx::Size());
+  FaviconID id = db.AddFavicon(url, TOUCH_ICON, GetDefaultFaviconSizes());
 
   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, TOUCH_ICON, GetDefaultFaviconSizes());
   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, TOUCH_ICON, GetDefaultFaviconSizes());
   base::Time time = base::Time::Now();
   db.AddFaviconBitmap(id, favicon, time, gfx::Size());
   EXPECT_TRUE(0 < db.AddIconMapping(url, id));
 
-  FaviconID id2 = db.AddFavicon(url, FAVICON);
-  db.AddFaviconBitmap(id2, favicon, time, gfx::Size());
+  FaviconID id2 = db.AddFavicon(url, FAVICON, GetDefaultFaviconSizes());
   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.GetIconMappingsForPageURL(url, FAVICON, NULL));
 
   db.DeleteIconMappings(url);
 
   EXPECT_FALSE(db.GetIconMappingsForPageURL(url, 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, TOUCH_ICON,
+                                GetFaviconSizesSmallAndLarge());
   base::Time time = base::Time::Now();
   db.AddFaviconBitmap(id1, favicon, time, kSmallSize);
   db.AddFaviconBitmap(id1, favicon, time, kLargeSize);
   EXPECT_TRUE(0 < db.AddIconMapping(url, id1));
 
-  FaviconID id2 = db.AddFavicon(url, FAVICON);
+  FaviconID id2 = db.AddFavicon(url, FAVICON, GetFaviconSizesSmallAndLarge());
   EXPECT_NE(id1, id2);
   db.AddFaviconBitmap(id2, favicon, time, kSmallSize);
   EXPECT_TRUE(0 < db.AddIconMapping(url, id2));
 
   std::vector<IconMapping> icon_mappings;
   EXPECT_TRUE(db.GetIconMappingsForPageURL(url, &icon_mappings));
   ASSERT_EQ(2u, icon_mappings.size());
   EXPECT_EQ(id1, icon_mappings[0].icon_id);
   EXPECT_EQ(id2, icon_mappings[1].icon_id);
 }
@@ skipping 142 matching lines @@
   ASSERT_EQ(sql::INIT_OK, db.Init(file_name_, NULL, NULL));
 
   db.BeginTransaction();
 
   EXPECT_TRUE(db.InitTemporaryTables());
 
   std::vector<unsigned char> data(blob1, blob1 + sizeof(blob1));
   scoped_refptr<base::RefCountedBytes> favicon(new base::RefCountedBytes(data));
 
   GURL unkept_url("http://google.com/favicon2.ico");
-  FaviconID unkept_id = db.AddFavicon(unkept_url, FAVICON);
+  FaviconID unkept_id = db.AddFavicon(unkept_url, FAVICON,
+                                      GetFaviconSizesSmallAndLarge());
   db.AddFaviconBitmap(unkept_id, favicon, base::Time::Now(), kSmallSize);
 
   GURL kept_url("http://google.com/favicon.ico");
-  FaviconID kept_id = db.AddFavicon(kept_url, FAVICON);
+  FaviconID kept_id = db.AddFavicon(kept_url, FAVICON,
+                                    GetFaviconSizesSmallAndLarge());
   db.AddFaviconBitmap(kept_id, favicon, base::Time::Now(), kLargeSize);
 
   GURL page_url("http://google.com");
   db.AddIconMapping(page_url, unkept_id);
   db.AddIconMapping(page_url, kept_id);
 
   FaviconID new_favicon_id =
       db.CopyFaviconAndFaviconBitmapsToTemporaryTables(kept_id);
   EXPECT_NE(0, new_favicon_id);
   EXPECT_TRUE(db.AddToTemporaryIconMappingTable(page_url, new_favicon_id));
@@ skipping 23 matching lines @@
   db.BeginTransaction();
 
   std::vector<unsigned char> data1(blob1, blob1 + sizeof(blob1));
   scoped_refptr<base::RefCountedBytes> favicon1(
       new base::RefCountedBytes(data1));
   std::vector<unsigned char> data2(blob2, blob2 + sizeof(blob2));
   scoped_refptr<base::RefCountedBytes> favicon2(
       new base::RefCountedBytes(data2));
 
   GURL url("http://google.com");
-  FaviconID id = db.AddFavicon(url, FAVICON);
+  FaviconID id = db.AddFavicon(url, FAVICON, GetFaviconSizesSmallAndLarge());
   base::Time last_updated = base::Time::Now();
   db.AddFaviconBitmap(id, favicon1, last_updated, kSmallSize);
   db.AddFaviconBitmap(id, favicon2, last_updated, kLargeSize);
 
   EXPECT_TRUE(db.GetFaviconBitmaps(id, NULL));
 
   EXPECT_TRUE(db.DeleteFavicon(id));
   EXPECT_FALSE(db.GetFaviconBitmaps(id, NULL));
 }
 
 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);
+  GURL page_url("http://google.com");
+  GURL icon_url("http://google.com/favicon.ico");
   base::Time time = base::Time::Now();
-  db.AddFaviconBitmap(id, favicon, time, gfx::Size());
 
-  EXPECT_NE(0, db.AddIconMapping(url, id));
-  std::vector<IconMapping> icon_mapping;
-  EXPECT_TRUE(db.GetIconMappingsForPageURL(url, &icon_mapping));
+  FaviconID id = db.AddFavicon(icon_url, FAVICON, GetDefaultFaviconSizes(),
+      favicon, time, gfx::Size());
+  EXPECT_NE(0, db.AddIconMapping(page_url, id));
+  std::vector<IconMapping> icon_mappings;
+  EXPECT_TRUE(db.GetIconMappingsForPageURL(page_url, &icon_mappings));
 
-  EXPECT_EQ(url, icon_mapping.front().page_url);
-  EXPECT_EQ(id, icon_mapping.front().icon_id);
-  EXPECT_EQ(FAVICON, icon_mapping.front().icon_type);
+  EXPECT_EQ(page_url, icon_mappings.front().page_url);
+  EXPECT_EQ(id, icon_mappings.front().icon_id);
+  EXPECT_EQ(FAVICON, icon_mappings.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);
-  db.AddFaviconBitmap(id2, favicon2, time, gfx::Size());
-  EXPECT_NE(0, db.AddIconMapping(url, id2));
+  FaviconID id2 = db.AddFavicon(icon_url, TOUCH_ICON,
+      GetDefaultFaviconSizes(), favicon2, time, gfx::Size());
+  EXPECT_NE(0, db.AddIconMapping(page_url, id2));
 
-  icon_mapping.clear();
-  EXPECT_TRUE(db.GetIconMappingsForPageURL(url, &icon_mapping));
+  icon_mappings.clear();
+  EXPECT_TRUE(db.GetIconMappingsForPageURL(page_url, &icon_mappings));
 
-  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);
+  EXPECT_EQ(page_url, icon_mappings.front().page_url);
+  EXPECT_EQ(id2, icon_mappings.front().icon_id);
+  EXPECT_EQ(TOUCH_ICON, icon_mappings.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);
-  db.AddFaviconBitmap(id3, favicon3, time, gfx::Size());
-  EXPECT_NE(0, db.AddIconMapping(url, id3));
+  FaviconID id3 = db.AddFavicon(icon_url, TOUCH_PRECOMPOSED_ICON,
+      GetDefaultFaviconSizes(), favicon3, time, gfx::Size());
+  EXPECT_NE(0, db.AddIconMapping(page_url, id3));
 
-  icon_mapping.clear();
-  EXPECT_TRUE(db.GetIconMappingsForPageURL(url, &icon_mapping));
+  icon_mappings.clear();
+  EXPECT_TRUE(db.GetIconMappingsForPageURL(page_url, &icon_mappings));
 
-  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);
+  EXPECT_EQ(page_url, icon_mappings.front().page_url);
+  EXPECT_EQ(id3, icon_mappings.front().icon_id);
+  EXPECT_EQ(TOUCH_PRECOMPOSED_ICON, icon_mappings.front().icon_type);
 }
 
 // Test result of GetIconMappingsForPageURL when an icon type is passed in.
 TEST_F(ThumbnailDatabaseTest, GetIconMappingsForPageURLWithIconType) {
   ThumbnailDatabase db;
   ASSERT_EQ(sql::INIT_OK, db.Init(file_name_, NULL, NULL));
   db.BeginTransaction();
 
   GURL url("http://google.com");
   std::vector<unsigned char> data(blob1, blob1 + sizeof(blob1));
   scoped_refptr<base::RefCountedBytes> favicon(new base::RefCountedBytes(data));
   base::Time time = base::Time::Now();
 
   FaviconID id1 = db.AddFavicon(url, FAVICON, GetDefaultFaviconSizes(),
                                 favicon, time, gfx::Size());
   EXPECT_NE(0, db.AddIconMapping(url, id1));
 
   FaviconID id2 = db.AddFavicon(url, TOUCH_ICON, GetDefaultFaviconSizes(),
                                 favicon, time, gfx::Size());
   EXPECT_NE(0, db.AddIconMapping(url, id2));
 
+  FaviconID id3 = db.AddFavicon(url, TOUCH_ICON, GetDefaultFaviconSizes(),
+                                favicon, time, gfx::Size());
+  EXPECT_NE(0, db.AddIconMapping(url, id3));
+
+  // Only the mappings for favicons of type TOUCH_ICON should be returned as
+  // TOUCH_ICON is a larger icon type than FAVICON.
   std::vector<IconMapping> icon_mappings;
-  EXPECT_TRUE(db.GetIconMappingsForPageURL(url, FAVICON | TOUCH_ICON,
-                                           &icon_mappings));
+  EXPECT_TRUE(db.GetIconMappingsForPageURL(
+      url,
+      FAVICON | TOUCH_ICON | TOUCH_PRECOMPOSED_ICON,
+      &icon_mappings));
+
   EXPECT_EQ(2u, icon_mappings.size());
-  EXPECT_EQ(id2, icon_mappings[0].icon_id);
-  EXPECT_EQ(id1, icon_mappings[1].icon_id);
+  if (id2 == icon_mappings[0].icon_id) {
+    EXPECT_EQ(id3, icon_mappings[1].icon_id);
+  } else {
+    EXPECT_EQ(id3, icon_mappings[0].icon_id);
+    EXPECT_EQ(id2, icon_mappings[1].icon_id);
+  }
 
   icon_mappings.clear();
   EXPECT_TRUE(db.GetIconMappingsForPageURL(url, TOUCH_ICON, &icon_mappings));
+  if (id2 == icon_mappings[0].icon_id) {
+    EXPECT_EQ(id3, icon_mappings[1].icon_id);
+  } else {
+    EXPECT_EQ(id3, icon_mappings[0].icon_id);
+    EXPECT_EQ(id2, icon_mappings[1].icon_id);
+  }
+
+  icon_mappings.clear();
+  EXPECT_TRUE(db.GetIconMappingsForPageURL(url, FAVICON, &icon_mappings));
   EXPECT_EQ(1u, icon_mappings.size());
-  EXPECT_EQ(id2, icon_mappings[0].icon_id);
+  EXPECT_EQ(id1, icon_mappings[0].icon_id);
 }
 
 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);
+  base::Time time = base::Time::Now();
+  FaviconID id1 = db.AddFavicon(GURL("http://google.com"), FAVICON,
+      GetDefaultFaviconSizes(), favicon, time, gfx::Size());
   EXPECT_NE(id1, 0);
-  base::Time time = base::Time::Now();
-  db.AddFaviconBitmap(id1, favicon, time, gfx::Size());
 
   // Add another type of favicon
-  FaviconID id2 = db.AddFavicon(GURL("http://www.google.com/icon"), TOUCH_ICON);
+  time = base::Time::Now();
+  FaviconID id2 = db.AddFavicon(GURL("http://www.google.com/icon"), TOUCH_ICON,
+      GetDefaultFaviconSizes(), favicon, time, gfx::Size());
   EXPECT_NE(id2, 0);
-  time = base::Time::Now();
-  db.AddFaviconBitmap(id2, favicon, time, gfx::Size());
 
   // Add 3rd favicon
-  FaviconID id3 = db.AddFavicon(GURL("http://www.google.com/icon"), TOUCH_ICON);
+  time = base::Time::Now();
+  FaviconID id3 = db.AddFavicon(GURL("http://www.google.com/icon"), TOUCH_ICON,
+      GetDefaultFaviconSizes(), favicon, time, gfx::Size());
   EXPECT_NE(id3, 0);
-  time = base::Time::Now();
-  db.AddFaviconBitmap(id3, favicon, time, gfx::Size());
 
   // 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, CloneIconMappings) {
   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"), FAVICON,
+                                GetDefaultFaviconSizes());
   EXPECT_NE(0, id1);
   base::Time time = base::Time::Now();
   db.AddFaviconBitmap(id1, favicon, time, gfx::Size());
 
   // 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"), TOUCH_ICON,
+                                GetDefaultFaviconSizes());
   EXPECT_NE(0, id2);
   time = base::Time::Now();
   db.AddFaviconBitmap(id2, favicon, time, gfx::Size());
 
   // 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"), TOUCH_ICON,
+                                GetDefaultFaviconSizes());
   EXPECT_NE(0, id3);
   time = base::Time::Now();
   db.AddFaviconBitmap(id3, favicon, time, gfx::Size());
 
   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 81 matching lines @@
 
 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);
+  GURL icon_url1("http://google.com/favicon.ico");
+  FaviconID touch_icon_id1 = db.AddFavicon(icon_url1, TOUCH_ICON,
+      GetDefaultFaviconSizes(), favicon, base::Time::Now(), gfx::Size());
   ASSERT_NE(0, touch_icon_id1);
-  ASSERT_TRUE(db.AddFaviconBitmap(touch_icon_id1, favicon, base::Time::Now(),
-                                  gfx::Size()));
   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(icon_url1, FAVICON,
+      GetDefaultFaviconSizes(), favicon, base::Time::Now(), gfx::Size());
   ASSERT_NE(0, favicon_id1);
-  ASSERT_TRUE(db.AddFaviconBitmap(favicon_id1, favicon, base::Time::Now(),
-                                  gfx::Size()));
   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);
+  GURL icon_url2("http://chromium.org/favicon.ico");
+  FaviconID favicon_id2 = db.AddFavicon(icon_url2, FAVICON,
+      GetDefaultFaviconSizes(), favicon, base::Time::Now(), gfx::Size());
   ASSERT_NE(0, favicon_id2);
-  ASSERT_TRUE(db.AddFaviconBitmap(favicon_id2, favicon, base::Time::Now(),
-                                  gfx::Size()));
   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;
   bool has_favicon_mapping2 = false;
   int mapping_count = 0;
@@ skipping 54 matching lines @@
   }
 
   std::string sizes_as_string;
   ThumbnailDatabase::FaviconSizesToDatabaseString(sizes_valid,
                                                   &sizes_as_string);
   EXPECT_TRUE(sizes_as_string == "10 15 20 25" ||
               sizes_as_string == "20 25 10 15");
 }
 
 }  // namespace history