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

chrome/browser/history/expire_history_backend.h

 // 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.
 
 #ifndef CHROME_BROWSER_HISTORY_EXPIRE_HISTORY_BACKEND_H_
 #define CHROME_BROWSER_HISTORY_EXPIRE_HISTORY_BACKEND_H_
 #pragma once
 
 #include <queue>
 #include <set>
@@ skipping 181 matching lines @@
   // by the given visits. It will then add versions of the visits to that
   // database. The source database WILL NOT BE MODIFIED. The source URLs and
   // visits will have to be deleted in another pass.
   //
   // The affected URLs will be filled into the given dependencies structure.
   void ArchiveURLsAndVisits(const VisitVector& visits,
                             DeleteDependencies* dependencies);
 
   // Deletes the favicons listed in the set if unused. Fails silently (we don't
   // care about favicons so much, so don't want to stop everything if it fails).
-  void DeleteFaviconsIfPossible(const std::set<FavIconID>& favicon_id);
+  void DeleteFaviconsIfPossible(const std::set<FaviconID>& favicon_id);
 
   // Broadcast the URL deleted notification.
   void BroadcastDeleteNotifications(DeleteDependencies* dependencies);
 
   // Schedules a call to DoArchiveIteration.
   void ScheduleArchive();
 
   // Calls ArchiveSomeOldHistory to expire some amount of old history, according
   // to the items in work queue, and schedules another call to happen in the
   // future.
@@ skipping 70 matching lines @@
   // Use GetBookmarkService to access this, which makes sure the service is
   // loaded.
   BookmarkService* bookmark_service_;
 
   DISALLOW_COPY_AND_ASSIGN(ExpireHistoryBackend);
 };
 
 }  // namespace history
 
 #endif  // CHROME_BROWSER_HISTORY_EXPIRE_HISTORY_BACKEND_H_