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

chrome/browser/history/history_backend_unittest.cc

 // Copyright (c) 2011 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 <set>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 112 matching lines @@
     URLID id = backend_->db()->GetRowForURL(url, &row);
     VisitVector visits;
     EXPECT_TRUE(backend_->db()->GetVisitsForURL(id, &visits));
     return visits[0].transition;
   }
 
   FilePath getTestDir() {
     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))
       return icon_mapping.icon_id;
     else
       return 0;
   }
 
   BookmarkModel bookmark_model_;
 
@@ skipping 65 matching lines @@
 
 TEST_F(HistoryBackendTest, DeleteAll) {
   ASSERT_TRUE(backend_.get());
 
   // Add two favicons, use the characters '1' and '2' for the image data. Note
   // that we do these in the opposite order. This is so the first one gets ID
   // 2 autoassigned to the database, which will change when the other one is
   // 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;
   data.push_back('1');
   EXPECT_TRUE(backend_->thumbnail_db_->SetFavicon(favicon1,
       new RefCountedBytes(data), Time::Now()));
 
   data[0] = '2';
   EXPECT_TRUE(backend_->thumbnail_db_->SetFavicon(
                   favicon2, new RefCountedBytes(data), Time::Now()));
@@ skipping 83 matching lines @@
   ASSERT_EQ(0U, all_visits.size());
 
   // All thumbnails should be deleted.
   std::vector<unsigned char> out_data;
   EXPECT_FALSE(backend_->thumbnail_db_->GetPageThumbnail(outrow1.id(),
                                                          &out_data));
   EXPECT_FALSE(backend_->thumbnail_db_->GetPageThumbnail(row2_id, &out_data));
 
   // 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
   // ID has changed.
   EXPECT_EQ(out_favicon1, GetFavicon(outrow1.url(), FAV_ICON));
 
   // The first URL should still be bookmarked.
   EXPECT_TRUE(bookmark_model_.IsBookmarked(row1.url()));
 
   // The full text database should have no data.
   std::vector<TextDatabase::Match> text_matches;
   Time first_time_searched;
   backend_->text_database_->GetTextMatches(UTF8ToUTF16("Body"),
                                            QueryOptions(),
                                            &text_matches,
                                            &first_time_searched);
   EXPECT_EQ(0U, text_matches.size());
 }
 
 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;
   data.push_back('1');
   EXPECT_TRUE(backend_->thumbnail_db_->SetFavicon(
                   favicon1, new RefCountedBytes(data), Time::Now()));
 
   data[0] = '2';
   EXPECT_TRUE(backend_->thumbnail_db_->SetFavicon(
                   favicon2, new RefCountedBytes(data), Time::Now()));
@@ skipping 27 matching lines @@
   backend_->expirer_.DeleteURL(row2.url());
 
   // Make sure url 2 is still valid, but has no visits.
   URLRow tmp_url_row;
   EXPECT_EQ(row2_id, backend_->db_->GetRowForURL(row2.url(), NULL));
   VisitVector visits;
   backend_->db_->GetVisitsForURL(row2_id, &visits);
   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));
 
   // Unstar row2.
   bookmark_model_.SetURLStarred(row2.url(), string16(), false);
   // Tell the backend it was unstarred. We have to explicitly do this as
   // BookmarkModel isn't wired up to the backend during testing.
   std::set<GURL> unstarred_urls;
   unstarred_urls.insert(row2.url());
   backend_->URLsNoLongerBookmarked(unstarred_urls);
 
   // The URL should no longer exist.
   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));
 
   // Unstar row 1.
   bookmark_model_.SetURLStarred(row1.url(), string16(), false);
   // Tell the backend it was unstarred. We have to explicitly do this as
   // BookmarkModel isn't wired up to the backend during testing.
   unstarred_urls.clear();
   unstarred_urls.insert(row1.url());
   backend_->URLsNoLongerBookmarked(unstarred_urls);
 
   // The URL should still exist (because there were visits).
   EXPECT_EQ(row1_id, backend_->db_->GetRowForURL(row1.url(), NULL));
 
   // There should still be visits.
   visits.clear();
   backend_->db_->GetVisitsForURL(row1_id, &visits);
   EXPECT_EQ(1U, visits.size());
 
   // The favicon should still be valid.
   EXPECT_EQ(favicon1,
-      backend_->thumbnail_db_->GetFavIconIDForFavIconURL(favicon_url1,
+      backend_->thumbnail_db_->GetFaviconIDForFavIconURL(favicon_url1,
                                                          FAV_ICON,
                                                          NULL));
 }
 
 // Tests a handful of assertions for a navigation with a type of
 // KEYWORD_GENERATED.
 TEST_F(HistoryBackendTest, KeywordGenerated) {
   ASSERT_TRUE(backend_.get());
 
   GURL url("http://google.com");
@@ skipping 64 matching lines @@
   GURL url_c("http://google.com/c");
   AddClientRedirect(url_b, url_c, true, &transition1, &transition2);
   EXPECT_FALSE(transition1 & PageTransition::CHAIN_END);
   EXPECT_TRUE(transition2 & PageTransition::CHAIN_END);
 }
 
 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');
   EXPECT_TRUE(backend_->thumbnail_db_->SetFavicon(favicon1,
       RefCountedBytes::TakeVector(&data), Time::Now()));
   URLRow row1(GURL("http://www.google.com/"));
   row1.set_visit_count(1);
   row1.set_last_visit(Time::Now());
   EXPECT_TRUE(backend_->thumbnail_db_->AddIconMapping(row1.url(), favicon1));
 
@@ skipping 350 matching lines @@
   EXPECT_TRUE(backend_->thumbnail_db_->GetIconMappingForPageURL(
       url1, FAV_ICON, NULL));
   // The TOUCH_PRECOMPOSED_ICON was replaced.
   EXPECT_FALSE(backend_->thumbnail_db_->GetIconMappingForPageURL(
       url1, TOUCH_PRECOMPOSED_ICON, NULL));
 
   // Add a fav_icon
   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;
   EXPECT_TRUE(backend_->thumbnail_db_->GetIconMappingsForPageURL(
       url1, &icon_mapping));
   // The old icon was replaced.
   EXPECT_TRUE(icon_mapping.size() > 1);
   EXPECT_EQ(icon_id, icon_mapping[1].icon_id);
 }
 
 TEST_F(HistoryBackendTest, AddOrUpdateIconMapping) {
   // Test the same icon and page mapping will not be added twice. other case
   // should be covered in TEST_F(HistoryBackendTest, SetFaviconMapping)
   const GURL url("http://www.google.com/");
   const GURL icon_url("http://www.google.com/icon");
   std::vector<unsigned char> data(blob1, blob1 + sizeof(blob1));
 
   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);
 
   std::vector<IconMapping> icon_mapping;
   EXPECT_TRUE(backend_->thumbnail_db_->GetIconMappingsForPageURL(
       url, &icon_mapping));
   EXPECT_EQ(1u, icon_mapping.size());
 }
 
 }  // namespace history