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

chrome/browser/history/expire_history_backend_unittest.cc

 // Copyright (c) 2010 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 <string>
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
@@ skipping 47 matching lines @@
         now_(Time::Now()) {
   }
 
  protected:
   // Called by individual tests when they want data populated.
   void AddExampleData(URLID url_ids[3], Time visit_times[4]);
   // Add visits with source information.
   void AddExampleSourceData(const GURL& url, URLID* id);
 
   // Returns true if the given favicon/thumanil has an entry in the DB.
-  bool HasFavIcon(FavIconID favicon_id);
+  bool HasFavIcon(FaviconID favicon_id);
   bool HasThumbnail(URLID url_id);
 
-  FavIconID GetFavicon(const GURL& page_url, IconType icon_type);
+  FaviconID GetFavicon(const GURL& page_url, IconType icon_type);
 
   // Returns the number of text matches for the given URL in the example data
   // added by AddExampleData.
   int CountTextMatchesForURL(const GURL& url);
 
   // EXPECTs that each URL-specific history thing (basically, everything but
   // favicons) is gone.
   void EnsureURLInfoGone(const URLRow& row);
 
   // Clears the list of notifications received.
@@ skipping 111 matching lines @@
     return;
 
   // Four times for each visit.
   visit_times[3] = Time::Now();
   visit_times[2] = visit_times[3] - TimeDelta::FromDays(1);
   visit_times[1] = visit_times[3] - TimeDelta::FromDays(2);
   visit_times[0] = visit_times[3] - TimeDelta::FromDays(3);
 
   // Two favicons. The first two URLs will share the same one, while the last
   // one will have a unique favicon.
-  FavIconID favicon1 = thumb_db_->AddFavIcon(GURL("http://favicon/url1"),
+  FaviconID favicon1 = thumb_db_->AddFavIcon(GURL("http://favicon/url1"),
                                              FAV_ICON);
-  FavIconID favicon2 = thumb_db_->AddFavIcon(GURL("http://favicon/url2"),
+  FaviconID favicon2 = thumb_db_->AddFavIcon(GURL("http://favicon/url2"),
                                              FAV_ICON);
 
   // Three URLs.
   URLRow url_row1(GURL("http://www.google.com/1"));
   url_row1.set_last_visit(visit_times[0]);
   url_row1.set_visit_count(1);
   url_ids[0] = main_db_->AddURL(url_row1);
   thumb_db_->AddIconMapping(url_row1.url(), favicon1);
 
   URLRow url_row2(GURL("http://www.google.com/2"));
@@ skipping 87 matching lines @@
   main_db_->AddVisit(&visit_row2, SOURCE_BROWSED);
 
   VisitRow visit_row3(url_id, last_visit_time - TimeDelta::FromDays(2), 0,
                       PageTransition::TYPED, 0);
   main_db_->AddVisit(&visit_row3, SOURCE_EXTENSION);
 
   VisitRow visit_row4(url_id, last_visit_time, 0, PageTransition::TYPED, 0);
   main_db_->AddVisit(&visit_row4, SOURCE_FIREFOX_IMPORTED);
 }
 
-bool ExpireHistoryTest::HasFavIcon(FavIconID favicon_id) {
+bool ExpireHistoryTest::HasFavIcon(FaviconID favicon_id) {
   if (!thumb_db_.get() || favicon_id == 0)
     return false;
   Time last_updated;
   std::vector<unsigned char> icon_data_unused;
   GURL icon_url;
   return thumb_db_->GetFavicon(favicon_id, &last_updated, &icon_data_unused,
                                &icon_url);
 }
 
-FavIconID ExpireHistoryTest::GetFavicon(const GURL& page_url,
+FaviconID ExpireHistoryTest::GetFavicon(const GURL& page_url,
                                         IconType icon_type) {
   IconMapping icon_mapping;
   thumb_db_->GetIconMappingForPageURL(page_url, icon_type, &icon_mapping);
   return icon_mapping.icon_id;
 }
 
 bool ExpireHistoryTest::HasThumbnail(URLID url_id) {
   // TODO(sky): fix this. This test isn't really valid for TopSites. For
   // TopSites we should be checking URL always, not the id.
   URLRow info;
@@ skipping 72 matching lines @@
           found_typed_changed_notification = true;
     }
   }
   EXPECT_TRUE(found_delete_notification);
   EXPECT_EQ(row.typed_count() > 0, found_typed_changed_notification);
 }
 
 TEST_F(ExpireHistoryTest, DeleteFaviconsIfPossible) {
   // Add a favicon record.
   const GURL favicon_url("http://www.google.com/favicon.ico");
-  FavIconID icon_id = thumb_db_->AddFavIcon(favicon_url, FAV_ICON);
+  FaviconID icon_id = thumb_db_->AddFavIcon(favicon_url, FAV_ICON);
   EXPECT_TRUE(icon_id);
   EXPECT_TRUE(HasFavIcon(icon_id));
 
   // The favicon should be deletable with no users.
-  std::set<FavIconID> favicon_set;
+  std::set<FaviconID> favicon_set;
   favicon_set.insert(icon_id);
   expirer_.DeleteFaviconsIfPossible(favicon_set);
   EXPECT_FALSE(HasFavIcon(icon_id));
 
   // Add back the favicon.
   icon_id = thumb_db_->AddFavIcon(favicon_url, TOUCH_ICON);
   EXPECT_TRUE(icon_id);
   EXPECT_TRUE(HasFavIcon(icon_id));
 
   // Add a page that references the favicon.
@@ skipping 21 matching lines @@
 // should also get deleted.
 // Fails near end of month. http://crbug.com/43586
 TEST_F(ExpireHistoryTest, FLAKY_DeleteURLAndFavicon) {
   URLID url_ids[3];
   Time visit_times[4];
   AddExampleData(url_ids, visit_times);
 
   // Verify things are the way we expect with a URL row, favicon, thumbnail.
   URLRow last_row;
   ASSERT_TRUE(main_db_->GetURLRow(url_ids[2], &last_row));
-  FavIconID fav_icon_id = GetFavicon(last_row.url(), FAV_ICON);
+  FaviconID fav_icon_id = GetFavicon(last_row.url(), FAV_ICON);
   EXPECT_TRUE(HasFavIcon(fav_icon_id));
   // TODO(sky): fix this, see comment in HasThumbnail.
   // EXPECT_TRUE(HasThumbnail(url_ids[2]));
 
   VisitVector visits;
   main_db_->GetVisitsForURL(url_ids[2], &visits);
   ASSERT_EQ(1U, visits.size());
   EXPECT_EQ(1, CountTextMatchesForURL(last_row.url()));
 
   // In this test we also make sure that any pending entries in the text
@@ skipping 43 matching lines @@
 // Deletes a URL with a favicon that other URLs reference, so that the favicon
 // should not get deleted. This also tests deleting more than one visit.
 TEST_F(ExpireHistoryTest, DeleteURLWithoutFavicon) {
   URLID url_ids[3];
   Time visit_times[4];
   AddExampleData(url_ids, visit_times);
 
   // Verify things are the way we expect with a URL row, favicon, thumbnail.
   URLRow last_row;
   ASSERT_TRUE(main_db_->GetURLRow(url_ids[1], &last_row));
-  FavIconID fav_icon_id = GetFavicon(last_row.url(), FAV_ICON);
+  FaviconID fav_icon_id = GetFavicon(last_row.url(), FAV_ICON);
   EXPECT_TRUE(HasFavIcon(fav_icon_id));
   // TODO(sky): fix this, see comment in HasThumbnail.
   // EXPECT_TRUE(HasThumbnail(url_ids[1]));
 
   VisitVector visits;
   main_db_->GetVisitsForURL(url_ids[1], &visits);
   EXPECT_EQ(2U, visits.size());
   EXPECT_EQ(1, CountTextMatchesForURL(last_row.url()));
 
   // Delete the URL and its dependencies.
@@ skipping 17 matching lines @@
   StarURL(url_row.url());
 
   // Attempt to delete the url.
   expirer_.DeleteURL(url_row.url());
 
   // Because the url is starred, it shouldn't be deleted.
   GURL url = url_row.url();
   ASSERT_TRUE(main_db_->GetRowForURL(url, &url_row));
 
   // And the favicon should exist.
-  FavIconID fav_icon_id = GetFavicon(url_row.url(), FAV_ICON);
+  FaviconID fav_icon_id = GetFavicon(url_row.url(), FAV_ICON);
   EXPECT_TRUE(HasFavIcon(fav_icon_id));
 
   // But there should be no fts.
   ASSERT_EQ(0, CountTextMatchesForURL(url_row.url()));
 
   // And no visits.
   VisitVector visits;
   main_db_->GetVisitsForURL(url_row.id(), &visits);
   ASSERT_EQ(0U, visits.size());
 
@@ skipping 49 matching lines @@
   URLRow temp_row;
   ASSERT_TRUE(main_db_->GetURLRow(url_ids[1], &temp_row));
   EXPECT_TRUE(visit_times[2] == url_row1.last_visit());  // Previous value.
   EXPECT_TRUE(visit_times[1] == temp_row.last_visit());  // New value.
   EXPECT_EQ(2, url_row1.visit_count());
   EXPECT_EQ(1, temp_row.visit_count());
   EXPECT_EQ(1, url_row1.typed_count());
   EXPECT_EQ(0, temp_row.typed_count());
 
   // Verify that the middle URL's favicon and thumbnail is still there.
-  FavIconID fav_icon_id = GetFavicon(url_row1.url(), FAV_ICON);
+  FaviconID fav_icon_id = GetFavicon(url_row1.url(), FAV_ICON);
   EXPECT_TRUE(HasFavIcon(fav_icon_id));
   // TODO(sky): fix this, see comment in HasThumbnail.
   // EXPECT_TRUE(HasThumbnail(url_row1.id()));
 
   // Verify that the last URL was deleted.
-  FavIconID fav_icon_id2 = GetFavicon(url_row2.url(), FAV_ICON);
+  FaviconID fav_icon_id2 = GetFavicon(url_row2.url(), FAV_ICON);
   EnsureURLInfoGone(url_row2);
   EXPECT_FALSE(HasFavIcon(fav_icon_id2));
 }
 
 // Expires only a specific URLs more recent than a given time, with no starred
 // items.  Our time threshold is such that the URL should be updated (we delete
 // one of the two visits).
 TEST_F(ExpireHistoryTest, FlushRecentURLsUnstarredRestricted) {
   URLID url_ids[3];
   Time visit_times[4];
@@ skipping 32 matching lines @@
   URLRow temp_row;
   ASSERT_TRUE(main_db_->GetURLRow(url_ids[1], &temp_row));
   EXPECT_TRUE(visit_times[2] == url_row1.last_visit());  // Previous value.
   EXPECT_TRUE(visit_times[1] == temp_row.last_visit());  // New value.
   EXPECT_EQ(2, url_row1.visit_count());
   EXPECT_EQ(1, temp_row.visit_count());
   EXPECT_EQ(1, url_row1.typed_count());
   EXPECT_EQ(0, temp_row.typed_count());
 
   // Verify that the middle URL's favicon and thumbnail is still there.
-  FavIconID fav_icon_id = GetFavicon(url_row1.url(), FAV_ICON);
+  FaviconID fav_icon_id = GetFavicon(url_row1.url(), FAV_ICON);
   EXPECT_TRUE(HasFavIcon(fav_icon_id));
   // TODO(sky): fix this, see comment in HasThumbnail.
   // EXPECT_TRUE(HasThumbnail(url_row1.id()));
 
   // Verify that the last URL was not touched.
   EXPECT_TRUE(main_db_->GetURLRow(url_ids[2], &temp_row));
   EXPECT_TRUE(HasFavIcon(fav_icon_id));
   // TODO(sky): fix this, see comment in HasThumbnail.
   // EXPECT_TRUE(HasThumbnail(url_row2.id()));
 }
@@ skipping 28 matching lines @@
   // Visit/typed count should not be updated for bookmarks.
   EXPECT_EQ(0, new_url_row1.typed_count());
   EXPECT_EQ(1, new_url_row1.visit_count());
   EXPECT_EQ(0, new_url_row2.typed_count());
   EXPECT_EQ(0, new_url_row2.visit_count());
 
   // Thumbnails and favicons should still exist. Note that we keep thumbnails
   // that may have been updated since the time threshold. Since the URL still
   // exists in history, this should not be a privacy problem, we only update
   // the visit counts in this case for consistency anyway.
-  FavIconID fav_icon_id = GetFavicon(url_row1.url(), FAV_ICON);
+  FaviconID fav_icon_id = GetFavicon(url_row1.url(), FAV_ICON);
   EXPECT_TRUE(HasFavIcon(fav_icon_id));
   // TODO(sky): fix this, see comment in HasThumbnail.
   // EXPECT_TRUE(HasThumbnail(new_url_row1.id()));
   fav_icon_id = GetFavicon(url_row1.url(), FAV_ICON);
   EXPECT_TRUE(HasFavIcon(fav_icon_id));
   // TODO(sky): fix this, see comment in HasThumbnail.
   // EXPECT_TRUE(HasThumbnail(new_url_row2.id()));
 }
 
 TEST_F(ExpireHistoryTest, ArchiveHistoryBeforeUnstarred) {
@@ skipping 174 matching lines @@
   main_db_->GetVisitsForURL(url_id, &archived_visits);
   EXPECT_EQ(0U, archived_visits.size());
 }
 
 // TODO(brettw) add some visits with no URL to make sure everything is updated
 // properly. Have the visits also refer to nonexistent FTS rows.
 //
 // Maybe also refer to invalid favicons.
 
 }  // namespace history