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

chrome/browser/history/expire_history_backend.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 "chrome/browser/history/expire_history_backend.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "base/compiler_specific.h"
@@ skipping 135 matching lines @@
   std::map<URLID, URLRow> affected_urls;
 
   // ----- Filled by DeleteOneURL -----
 
   // The URLs deleted during this operation.
   std::vector<URLRow> deleted_urls;
 
   // The list of all favicon IDs that the affected URLs had. Favicons will be
   // shared between all URLs with the same favicon, so this is the set of IDs
   // that we will need to check when the delete operations are complete.
-  std::set<FavIconID> affected_favicons;
+  std::set<FaviconID> affected_favicons;
 
   // Tracks the set of databases that have changed so we can optimize when
   // when we're done.
   TextDatabaseManager::ChangeSet text_db_changes;
 };
 
 ExpireHistoryBackend::ExpireHistoryBackend(
     BroadcastNotificationDelegate* delegate,
     BookmarkService* bookmark_service)
     : delegate_(delegate),
@@ skipping 142 matching lines @@
   readers_.push_back(GetAllVisitsReader());
   readers_.push_back(GetAutoSubframeVisitsReader());
 
   // Initialize the queue with all tasks for the first set of iterations.
   InitWorkQueue();
   ScheduleArchive();
   ScheduleExpireHistoryIndexFiles();
 }
 
 void ExpireHistoryBackend::DeleteFaviconsIfPossible(
-    const std::set<FavIconID>& favicon_set) {
+    const std::set<FaviconID>& favicon_set) {
   if (!thumb_db_)
     return;
 
-  for (std::set<FavIconID>::const_iterator i = favicon_set.begin();
+  for (std::set<FaviconID>::const_iterator i = favicon_set.begin();
        i != favicon_set.end(); ++i) {
     if (!thumb_db_->HasMappingFor(*i))
       thumb_db_->DeleteFavIcon(*i);
   }
 }
 
 void ExpireHistoryBackend::BroadcastDeleteNotifications(
     DeleteDependencies* dependencies) {
   if (!dependencies->deleted_urls.empty()) {
     // Broadcast the URL deleted notification. Note that we also broadcast when
@@ skipping 303 matching lines @@
 
   // This will remove or archive all the affected URLs. Must do the deleting
   // cleanup before archiving so the delete dependencies structure references
   // only those URLs that were actually deleted instead of having some visits
   // archived and then the rest deleted.
   ExpireURLsForVisits(deleted_visits, &deleted_dependencies);
   ExpireURLsForVisits(archived_visits, &archived_dependencies);
 
   // Create a union of all affected favicons (we don't store favicons for
   // archived URLs) and delete them.
-  std::set<FavIconID> affected_favicons(
+  std::set<FaviconID> affected_favicons(
       archived_dependencies.affected_favicons);
-  for (std::set<FavIconID>::const_iterator i =
+  for (std::set<FaviconID>::const_iterator i =
            deleted_dependencies.affected_favicons.begin();
        i != deleted_dependencies.affected_favicons.end(); ++i) {
     affected_favicons.insert(*i);
   }
   DeleteFaviconsIfPossible(affected_favicons);
 
   // Send notifications for the stuff that was deleted. These won't normally be
   // in history views since they were subframes, but they will be in the visited
   // link system, which needs to be updated now. This function is smart enough
   // to not do anything if nothing was deleted.
@@ skipping 45 matching lines @@
   // We use the bookmark service to determine if a URL is bookmarked. The
   // bookmark service is loaded on a separate thread and may not be done by the
   // time we get here. We therefor block until the bookmarks have finished
   // loading.
   if (bookmark_service_)
     bookmark_service_->BlockTillLoaded();
   return bookmark_service_;
 }
 
 }  // namespace history