fav icon -> favicon. Pass 7: FavIconID -> FaviconID

chrome/browser/history/thumbnail_database_unittest.cc

 // Copyright (c) 2009 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 101 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<RefCountedBytes> favicon(new RefCountedBytes(data));
 
   GURL url("http://google.com");
-  FavIconID id = db.AddFavIcon(url, FAV_ICON);
+  FaviconID id = db.AddFavIcon(url, FAV_ICON);
   base::Time time = base::Time::Now();
   db.SetFavicon(id, favicon, time);
   EXPECT_TRUE(db.RenameAndDropThumbnails(file_name_, new_file_name_));
 
   base::Time time_out;
   std::vector<unsigned char> favicon_out;
   GURL url_out;
   EXPECT_TRUE(db.GetFavicon(id, &time_out, &favicon_out, &url_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()));
 }
 
 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<RefCountedBytes> favicon(new RefCountedBytes(data));
 
   GURL url("http://google.com");
-  FavIconID id = db.AddFavIcon(url, TOUCH_ICON);
+  FaviconID id = db.AddFavIcon(url, 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<RefCountedBytes> favicon(new RefCountedBytes(data));
 
   GURL url("http://google.com");
-  FavIconID id = db.AddFavIcon(url, TOUCH_ICON);
+  FaviconID id = db.AddFavIcon(url, 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, 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<RefCountedBytes> favicon(new RefCountedBytes(data));
 
   GURL url("http://google.com");
-  FavIconID id = db.AddFavIcon(url, TOUCH_ICON);
+  FaviconID id = db.AddFavIcon(url, 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, FAV_ICON);
+  FaviconID id2 = db.AddFavIcon(url, FAV_ICON);
   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, FAV_ICON, NULL));
 
   db.DeleteIconMappings(url);
 
   EXPECT_FALSE(db.GetIconMappingsForPageURL(url, NULL));
   EXPECT_FALSE(db.GetIconMappingForPageURL(url, FAV_ICON, 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<RefCountedBytes> favicon(new RefCountedBytes(data));
 
   GURL url("http://google.com");
 
-  FavIconID id1 = db.AddFavIcon(url, TOUCH_ICON);
+  FaviconID id1 = db.AddFavIcon(url, 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, FAV_ICON);
+  FaviconID id2 = db.AddFavIcon(url, FAV_ICON);
   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);
 }
@@ skipping 18 matching lines @@
              "last_updated INTEGER DEFAULT 0,"
              "image_data BLOB)");
   EXPECT_TRUE(db.db_.Execute(sql.c_str()));
 
   EXPECT_TRUE(db.UpgradeToVersion4());
 
   std::vector<unsigned char> data(blob1, blob1 + sizeof(blob1));
   scoped_refptr<RefCountedBytes> favicon(new RefCountedBytes(data));
 
   GURL url("http://google.com");
-  FavIconID id = db.AddFavIcon(url, TOUCH_ICON);
+  FaviconID id = db.AddFavIcon(url, TOUCH_ICON);
   base::Time time = base::Time::Now();
   db.SetFavicon(id, favicon, time);
 
   EXPECT_TRUE(0 < db.AddIconMapping(url, id));
   IconMapping icon_mapping;
   EXPECT_TRUE(db.GetIconMappingForPageURL(url, TOUCH_ICON, &icon_mapping));
   EXPECT_EQ(url, icon_mapping.page_url);
   EXPECT_EQ(id, icon_mapping.icon_id);
 }
 
 TEST_F(ThumbnailDatabaseTest, TemporayIconMapping) {
   ThumbnailDatabase db;
 
   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<RefCountedBytes> favicon(new RefCountedBytes(data));
 
   GURL url("http://google.com");
-  FavIconID id = db.AddFavIcon(url, FAV_ICON);
+  FaviconID id = db.AddFavIcon(url, FAV_ICON);
   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, FAV_ICON, &icon_mapping));
   EXPECT_EQ(id, icon_mapping.icon_id);
   EXPECT_EQ(url, icon_mapping.page_url);
 }
 
 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<RefCountedBytes> favicon(new RefCountedBytes(data));
 
   GURL url("http://google.com");
-  FavIconID id = db.AddFavIcon(url, FAV_ICON);
+  FaviconID id = db.AddFavIcon(url, FAV_ICON);
   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(FAV_ICON, icon_mapping.front().icon_type);
 
   // Add a touch icon
   std::vector<unsigned char> data2(blob2, blob2 + sizeof(blob2));
   scoped_refptr<RefCountedBytes> favicon2(new RefCountedBytes(data));
 
-  FavIconID id2 = db.AddFavIcon(url, TOUCH_ICON);
+  FaviconID id2 = db.AddFavIcon(url, 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<RefCountedBytes> favicon3(new RefCountedBytes(data2));
 
-  FavIconID id3 = db.AddFavIcon(url, TOUCH_PRECOMPOSED_ICON);
+  FaviconID id3 = db.AddFavIcon(url, 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<RefCountedBytes> favicon(new RefCountedBytes(data));
 
   // Add a favicon which will have icon_mappings
-  FavIconID id1 = db.AddFavIcon(GURL("http://google.com"), FAV_ICON);
+  FaviconID id1 = db.AddFavIcon(GURL("http://google.com"), FAV_ICON);
   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"), 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"), 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));
@@ skipping 55 matching lines @@
   ASSERT_TRUE(db.GetFavicon(
       icon_mappings[0].icon_id, &time, &out_data, &out_icon_url));
   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));
 }
 
 }  // namespace history