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

chrome/browser/history/history_backend_unittest.cc

Index: chrome/browser/history/history_backend_unittest.cc
diff --git a/chrome/browser/history/history_backend_unittest.cc b/chrome/browser/history/history_backend_unittest.cc
index ad1c869b1da87ad4372e56a58a24f8682efe6670..ada6b368c71318fe2abe4aa2d2966abe7682d4a5 100644
--- a/chrome/browser/history/history_backend_unittest.cc
+++ b/chrome/browser/history/history_backend_unittest.cc
@@ -130,7 +130,7 @@ class HistoryBackendTest : public testing::Test {
     return test_dir_;
   }
 
-  FavIconID GetFavicon(const GURL& url, IconType icon_type) {
+  FaviconID GetFavicon(const GURL& url, IconType icon_type) {
     IconMapping icon_mapping;
     if (backend_->thumbnail_db_->GetIconMappingForPageURL(url, icon_type,
                                                           &icon_mapping))
@@ -216,9 +216,9 @@ TEST_F(HistoryBackendTest, DeleteAll) {
   // deleted. This way we can test that updating works properly.
   GURL favicon_url1("http://www.google.com/favicon.ico");
   GURL favicon_url2("http://news.google.com/favicon.ico");
-  FavIconID favicon2 = backend_->thumbnail_db_->AddFavIcon(favicon_url2,
+  FaviconID favicon2 = backend_->thumbnail_db_->AddFavIcon(favicon_url2,
                                                            FAV_ICON);
-  FavIconID favicon1 = backend_->thumbnail_db_->AddFavIcon(favicon_url1,
+  FaviconID favicon1 = backend_->thumbnail_db_->AddFavIcon(favicon_url1,
                                                            FAV_ICON);
 
   std::vector<unsigned char> data;
@@ -322,11 +322,11 @@ TEST_F(HistoryBackendTest, DeleteAll) {
 
   // We should have a favicon for the first URL only. We look them up by favicon
   // URL since the IDs may hav changed.
-  FavIconID out_favicon1 = backend_->thumbnail_db_->
-      GetFavIconIDForFavIconURL(favicon_url1, FAV_ICON, NULL);
+  FaviconID out_favicon1 = backend_->thumbnail_db_->
+      GetFaviconIDForFavIconURL(favicon_url1, FAV_ICON, NULL);
   EXPECT_TRUE(out_favicon1);
-  FavIconID out_favicon2 = backend_->thumbnail_db_->
-      GetFavIconIDForFavIconURL(favicon_url2, FAV_ICON, NULL);
+  FaviconID out_favicon2 = backend_->thumbnail_db_->
+      GetFaviconIDForFavIconURL(favicon_url2, FAV_ICON, NULL);
   EXPECT_FALSE(out_favicon2) << "Favicon not deleted";
 
   // The remaining URL should still reference the same favicon, even if its
@@ -349,9 +349,9 @@ TEST_F(HistoryBackendTest, DeleteAll) {
 TEST_F(HistoryBackendTest, URLsNoLongerBookmarked) {
   GURL favicon_url1("http://www.google.com/favicon.ico");
   GURL favicon_url2("http://news.google.com/favicon.ico");
-  FavIconID favicon2 = backend_->thumbnail_db_->AddFavIcon(favicon_url2,
+  FaviconID favicon2 = backend_->thumbnail_db_->AddFavIcon(favicon_url2,
                                                            FAV_ICON);
-  FavIconID favicon1 = backend_->thumbnail_db_->AddFavIcon(favicon_url1,
+  FaviconID favicon1 = backend_->thumbnail_db_->AddFavIcon(favicon_url1,
                                                            FAV_ICON);
 
   std::vector<unsigned char> data;
@@ -399,7 +399,7 @@ TEST_F(HistoryBackendTest, URLsNoLongerBookmarked) {
   EXPECT_EQ(0U, visits.size());
   // The favicon should still be valid.
   EXPECT_EQ(favicon2,
-      backend_->thumbnail_db_->GetFavIconIDForFavIconURL(favicon_url2,
+      backend_->thumbnail_db_->GetFaviconIDForFavIconURL(favicon_url2,
                                                          FAV_ICON,
                                                          NULL));
 
@@ -415,7 +415,7 @@ TEST_F(HistoryBackendTest, URLsNoLongerBookmarked) {
   EXPECT_FALSE(backend_->db_->GetRowForURL(row2.url(), &tmp_url_row));
   // And the favicon should be deleted.
   EXPECT_EQ(0,
-      backend_->thumbnail_db_->GetFavIconIDForFavIconURL(favicon_url2,
+      backend_->thumbnail_db_->GetFaviconIDForFavIconURL(favicon_url2,
                                                          FAV_ICON,
                                                          NULL));
 
@@ -437,7 +437,7 @@ TEST_F(HistoryBackendTest, URLsNoLongerBookmarked) {
 
   // The favicon should still be valid.
   EXPECT_EQ(favicon1,
-      backend_->thumbnail_db_->GetFavIconIDForFavIconURL(favicon_url1,
+      backend_->thumbnail_db_->GetFaviconIDForFavIconURL(favicon_url1,
                                                          FAV_ICON,
                                                          NULL));
 }
@@ -522,7 +522,7 @@ TEST_F(HistoryBackendTest, ImportedFaviconsTest) {
   // Setup test data - two Urls in the history, one with favicon assigned and
   // one without.
   GURL favicon_url1("http://www.google.com/favicon.ico");
-  FavIconID favicon1 = backend_->thumbnail_db_->AddFavIcon(favicon_url1,
+  FaviconID favicon1 = backend_->thumbnail_db_->AddFavIcon(favicon_url1,
                                                            FAV_ICON);
   std::vector<unsigned char> data;
   data.push_back('1');
@@ -893,7 +893,7 @@ TEST_F(HistoryBackendTest, SetFaviconMapping) {
   const GURL icon_url2("http://www.google.com/icon2");
   backend_->SetFavicon(
       url1, icon_url2, RefCountedBytes::TakeVector(&data), FAV_ICON);
-  FavIconID icon_id = backend_->thumbnail_db_->GetFavIconIDForFavIconURL(
+  FaviconID icon_id = backend_->thumbnail_db_->GetFaviconIDForFavIconURL(
       icon_url2, FAV_ICON, NULL);
   EXPECT_NE(0, icon_id);
   std::vector<IconMapping> icon_mapping;
@@ -913,11 +913,11 @@ TEST_F(HistoryBackendTest, AddOrUpdateIconMapping) {
 
   backend_->SetFavicon(
       url, icon_url, RefCountedBytes::TakeVector(&data), FAV_ICON);
-  FavIconID icon_id = backend_->thumbnail_db_->GetFavIconIDForFavIconURL(
+  FaviconID icon_id = backend_->thumbnail_db_->GetFaviconIDForFavIconURL(
       icon_url, FAV_ICON, NULL);
 
   // Add the same mapping
-  FavIconID replaced;
+  FaviconID replaced;
   EXPECT_FALSE(backend_->AddOrUpdateIconMapping(
       url, icon_id, FAV_ICON, &replaced));
   EXPECT_EQ(0, replaced);