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

chrome/browser/history/thumbnail_database.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_THUMBNAIL_DATABASE_H_
 #define CHROME_BROWSER_HISTORY_THUMBNAIL_DATABASE_H_
 #pragma once
 
 #include <vector>
 
@@ skipping 80 matching lines @@
 
   // Called by the to delete all old thumbnails and make a clean table.
   // Returns true on success.
   bool RecreateThumbnailTable();
 
   // FavIcons ------------------------------------------------------------------
 
   // Sets the bits for a favicon. This should be png encoded data.
   // The time indicates the access time, and is used to detect when the favicon
   // should be refreshed.
-  bool SetFavicon(FavIconID icon_id,
+  bool SetFavicon(FaviconID icon_id,
                   scoped_refptr<RefCountedMemory> icon_data,
                   base::Time time);
 
   // Sets the time the favicon was last updated.
-  bool SetFaviconLastUpdateTime(FavIconID icon_id, base::Time time);
+  bool SetFaviconLastUpdateTime(FaviconID icon_id, base::Time time);
 
   // Returns the id of the entry in the favicon database with the specified url
   // and icon type. If |required_icon_type| contains multiple icon types and
   // there are more than one matched icon in database, only one icon will be
   // returned in the priority of TOUCH_PRECOMPOSED_ICON, TOUCH_ICON, and
   // FAV_ICON, and the icon type is returned in icon_type parameter if it is not
   // NULL.
   // Returns 0 if no entry exists for the specified url.
-  FavIconID GetFavIconIDForFavIconURL(const GURL& icon_url,
+  FaviconID GetFaviconIDForFavIconURL(const GURL& icon_url,
                                       int required_icon_type,
                                       IconType* icon_type);
 
   // Gets the png encoded favicon and last updated time for the specified
   // favicon id.
-  bool GetFavicon(FavIconID icon_id,
+  bool GetFavicon(FaviconID icon_id,
                   base::Time* last_updated,
                   std::vector<unsigned char>* png_icon_data,
                   GURL* icon_url);
 
   // Adds the favicon URL and icon type to the favicon db, returning its id.
-  FavIconID AddFavIcon(const GURL& icon_url, IconType icon_type);
+  FaviconID AddFavIcon(const GURL& icon_url, IconType icon_type);
 
   // Delete the favicon with the provided id. Returns false on failure
-  bool DeleteFavIcon(FavIconID id);
+  bool DeleteFavIcon(FaviconID id);
 
   // Icon Mapping --------------------------------------------------------------
   //
   // Returns true if there is a matched icon mapping for the given page and
   // icon type.
   // The matched icon mapping is returned in the icon_mapping parameter if it is
   // not NULL.
   bool GetIconMappingForPageURL(const GURL& page_url,
                                 IconType required_icon_type,
                                 IconMapping* icon_mapping);
 
   // Returns true if there is any matched icon mapping for the given page.
   // All matched icon mappings are returned in descent order of IconType if
   // mapping_data is not NULL.
   bool GetIconMappingsForPageURL(const GURL& page_url,
                                  std::vector<IconMapping>* mapping_data);
 
   // Adds a mapping between the given page_url and icon_id.
   // Returns the new mapping id if the adding succeeds, otherwise 0 is returned.
-  IconMappingID AddIconMapping(const GURL& page_url, FavIconID icon_id);
+  IconMappingID AddIconMapping(const GURL& page_url, FaviconID icon_id);
 
   // Updates the page and icon mapping for the given mapping_id with the given
   // icon_id.
   // Returns true if the update succeeded.
-  bool UpdateIconMapping(IconMappingID mapping_id, FavIconID icon_id);
+  bool UpdateIconMapping(IconMappingID mapping_id, FaviconID icon_id);
 
   // Deletes the icon mapping entries for the given page url.
   // Returns true if the deletion succeeded.
   bool DeleteIconMappings(const GURL& page_url);
 
   // Checks whether a favicon is used by any URLs in the database.
-  bool HasMappingFor(FavIconID id);
+  bool HasMappingFor(FaviconID id);
 
   // Temporary IconMapping -----------------------------------------------------
   //
   // Creates a temporary table to store icon mapping. Icon mapping will be
   // copied to this table by AddToTemporaryIconMappingTable() and then the
   // original table will be dropped, leaving only those copied mapping
   // remaining. This is used to quickly delete most of the icon mapping when
   // clearing history.
   bool InitTemporaryIconMappingTable() {
     return InitIconMappingTable(&db_, true);
   }
 
   // Copies the given icon mapping from the "main" icon_mapping table to the
   // temporary one. This is only valid in between calls to
   // InitTemporaryIconMappingTable()
   // and CommitTemporaryIconMappingTable().
   //
   // The ID of the favicon will change when this copy takes place. The new ID
   // is returned, or 0 on failure.
   IconMappingID AddToTemporaryIconMappingTable(const GURL& page_url,
-                                               const FavIconID icon_id);
+                                               const FaviconID icon_id);
 
   // Replaces the main icon mapping table with the temporary table created by
   // InitTemporaryIconMappingTable(). This will mean all icon mapping not copied
   // over will be deleted. Returns true on success.
   bool CommitTemporaryIconMappingTable();
 
   // Temporary FavIcons --------------------------------------------------------
 
   // Create a temporary table to store favicons. Favicons will be copied to
   // this table by CopyToTemporaryFavIconTable() and then the original table
   // will be dropped, leaving only those copied favicons remaining. This is
   // used to quickly delete most of the favicons when clearing history.
   bool InitTemporaryFavIconsTable() {
     return InitFavIconsTable(&db_, true);
   }
 
   // Copies the given favicon from the "main" favicon table to the temporary
   // one. This is only valid in between calls to InitTemporaryFavIconsTable()
   // and CommitTemporaryFavIconTable().
   //
   // The ID of the favicon will change when this copy takes place. The new ID
   // is returned, or 0 on failure.
-  FavIconID CopyToTemporaryFavIconTable(FavIconID source);
+  FaviconID CopyToTemporaryFavIconTable(FaviconID source);
 
   // Replaces the main URL table with the temporary table created by
   // InitTemporaryFavIconsTable(). This will mean all favicons not copied over
   // will be deleted. Returns true on success.
   bool CommitTemporaryFavIconTable();
 
   // Returns true iff the thumbnails table exists.
   // Migrating to TopSites is dropping the thumbnails table.
   bool NeedsMigrationToTopSites();
 
@@ skipping 43 matching lines @@
   // initialization after the table is created. This is a separate function
   // because it is used by CommitTemporaryIconMappingTable to create an index
   // over the newly-renamed icon_mapping table (formerly the temporary table
   // with no index).
   void InitIconMappingIndex();
 
   // Adds a mapping between the given page_url and icon_id; The mapping will be
   // added to temp_icon_mapping table if is_temporary is true.
   // Returns the new mapping id if the adding succeeds, otherwise 0 is returned.
   IconMappingID AddIconMapping(const GURL& page_url,
-                               FavIconID icon_id,
+                               FaviconID icon_id,
                                bool is_temporary);
 
   sql::Connection db_;
   sql::MetaTable meta_table_;
 
   // This object is created and managed by the history backend. We maintain an
   // opaque pointer to the object for our use.
   // This can be NULL if there are no indexers registered to receive indexing
   // data from us.
   const HistoryPublisher* history_publisher_;
 
   // True if migration to TopSites has been done and the thumbnails
   // table should not be used.
   bool use_top_sites_;
 };
 
 }  // namespace history
 
 #endif  // CHROME_BROWSER_HISTORY_THUMBNAIL_DATABASE_H_