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

chrome/browser/history/thumbnail_database.cc

 // Copyright (c) 2009 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/thumbnail_database.h"
 
 #include <algorithm>
 #include <string>
 
 #include "app/sql/statement.h"
@@ skipping 369 matching lines @@
         "UPDATE favicons SET image_data=NULL, last_updated=? WHERE id=?"));
     if (!statement)
       return 0;
 
     statement.BindInt64(0, time.ToTimeT());
     statement.BindInt64(1, icon_id);
     return statement.Run();
   }
 }
 
-bool ThumbnailDatabase::SetFaviconLastUpdateTime(FavIconID icon_id,
+bool ThumbnailDatabase::SetFaviconLastUpdateTime(FaviconID icon_id,
                                                  base::Time time) {
   sql::Statement statement(db_.GetCachedStatement(SQL_FROM_HERE,
       "UPDATE favicons SET last_updated=? WHERE id=?"));
   if (!statement)
     return 0;
 
   statement.BindInt64(0, time.ToTimeT());
   statement.BindInt64(1, icon_id);
   return statement.Run();
 }
 
-FavIconID ThumbnailDatabase::GetFavIconIDForFavIconURL(const GURL& icon_url,
+FaviconID ThumbnailDatabase::GetFaviconIDForFavIconURL(const GURL& icon_url,
                                                        int required_icon_type,
                                                        IconType* icon_type) {
   sql::Statement statement(db_.GetCachedStatement(SQL_FROM_HERE,
       "SELECT id, icon_type FROM favicons WHERE url=? AND (icon_type & ? > 0) "
       "ORDER BY icon_type DESC"));
   if (!statement)
     return 0;
 
   statement.BindString(0, URLDatabase::GURLToDatabaseURL(icon_url));
   statement.BindInt(1, required_icon_type);
   if (!statement.Step())
     return 0;  // not cached
 
   if (icon_type)
     *icon_type = static_cast<IconType>(statement.ColumnInt(1));
   return statement.ColumnInt64(0);
 }
 
 bool ThumbnailDatabase::GetFavicon(
-    FavIconID icon_id,
+    FaviconID icon_id,
     base::Time* last_updated,
     std::vector<unsigned char>* png_icon_data,
     GURL* icon_url) {
   DCHECK(icon_id);
 
   sql::Statement statement(db_.GetCachedStatement(SQL_FROM_HERE,
       "SELECT last_updated, image_data, url FROM favicons WHERE id=?"));
   if (!statement)
     return 0;
 
   statement.BindInt64(0, icon_id);
 
   if (!statement.Step())
     return false;  // No entry for the id.
 
   *last_updated = base::Time::FromTimeT(statement.ColumnInt64(0));
   if (statement.ColumnByteLength(1) > 0)
     statement.ColumnBlobAsVector(1, png_icon_data);
   if (icon_url)
     *icon_url = GURL(statement.ColumnString(2));
 
   return true;
 }
 
-FavIconID ThumbnailDatabase::AddFavIcon(const GURL& icon_url,
+FaviconID ThumbnailDatabase::AddFavIcon(const GURL& icon_url,
                                         IconType icon_type) {
 
   sql::Statement statement(db_.GetCachedStatement(SQL_FROM_HERE,
       "INSERT INTO favicons (url, icon_type) VALUES (?, ?)"));
   if (!statement)
     return 0;
 
   statement.BindString(0, URLDatabase::GURLToDatabaseURL(icon_url));
   statement.BindInt(1, icon_type);
   if (!statement.Run())
     return 0;
   return db_.GetLastInsertRowId();
 }
 
-bool ThumbnailDatabase::DeleteFavIcon(FavIconID id) {
+bool ThumbnailDatabase::DeleteFavIcon(FaviconID id) {
   sql::Statement statement(db_.GetCachedStatement(SQL_FROM_HERE,
       "DELETE FROM favicons WHERE id = ?"));
   if (!statement)
     return false;
 
   statement.BindInt64(0, id);
   return statement.Run();
 }
 
 bool ThumbnailDatabase::GetIconMappingForPageURL(const GURL& page_url,
@@ skipping 37 matching lines @@
       return result;
 
     IconMapping icon_mapping;
     FillIconMapping(statement, page_url, &icon_mapping);
     mapping_data->push_back(icon_mapping);
   }
   return result;
 }
 
 IconMappingID ThumbnailDatabase::AddIconMapping(const GURL& page_url,
-                                                FavIconID icon_id) {
+                                                FaviconID icon_id) {
   return AddIconMapping(page_url, icon_id, false);
 }
 
 bool ThumbnailDatabase::UpdateIconMapping(IconMappingID mapping_id,
-                                          FavIconID icon_id) {
+                                          FaviconID icon_id) {
   sql::Statement statement(db_.GetCachedStatement(SQL_FROM_HERE,
       "UPDATE icon_mapping SET icon_id=? WHERE id=?"));
   if (!statement)
     return 0;
 
   statement.BindInt64(0, icon_id);
   statement.BindInt64(1, mapping_id);
   return statement.Run();
 }
 
 bool ThumbnailDatabase::DeleteIconMappings(const GURL& page_url) {
   sql::Statement statement(db_.GetCachedStatement(SQL_FROM_HERE,
       "DELETE FROM icon_mapping WHERE page_url = ?"));
   if (!statement)
     return false;
 
   statement.BindString(0, URLDatabase::GURLToDatabaseURL(page_url));
   return statement.Run();
 }
 
-bool ThumbnailDatabase::HasMappingFor(FavIconID id) {
+bool ThumbnailDatabase::HasMappingFor(FaviconID id) {
   sql::Statement statement(db_.GetCachedStatement(SQL_FROM_HERE,
       "SELECT id FROM icon_mapping "
       "WHERE icon_id=?"));
   if (!statement)
     return false;
 
   statement.BindInt64(0, id);
   return statement.Step();
 }
 
 bool ThumbnailDatabase::MigrateIconMappingData(URLDatabase* url_db) {
   URLDatabase::IconMappingEnumerator e;
   if (!url_db->InitIconMappingEnumeratorForEverything(&e))
     return false;
 
   IconMapping info;
   while (e.GetNextIconMapping(&info)) {
     // TODO: Using bulk insert to improve the performance.
     if (!AddIconMapping(info.page_url, info.icon_id))
       return false;
   }
   return true;
 }
 
 IconMappingID ThumbnailDatabase::AddToTemporaryIconMappingTable(
-    const GURL& page_url, const FavIconID icon_id) {
+    const GURL& page_url, const FaviconID icon_id) {
   return AddIconMapping(page_url, icon_id, true);
 }
 
 bool ThumbnailDatabase::CommitTemporaryIconMappingTable() {
   // Delete the old icon_mapping table.
   if (!db_.Execute("DROP TABLE icon_mapping"))
     return false;
 
   // Rename the temporary one.
   if (!db_.Execute("ALTER TABLE temp_icon_mapping RENAME TO icon_mapping"))
     return false;
 
   // The renamed table needs the index (the temporary table doesn't have one).
   InitIconMappingIndex();
 
   return true;
 }
 
-FavIconID ThumbnailDatabase::CopyToTemporaryFavIconTable(FavIconID source) {
+FaviconID ThumbnailDatabase::CopyToTemporaryFavIconTable(FaviconID source) {
   sql::Statement statement(db_.GetCachedStatement(SQL_FROM_HERE,
       "INSERT INTO temp_favicons (url, last_updated, image_data, icon_type)"
       "SELECT url, last_updated, image_data, icon_type "
       "FROM favicons WHERE id = ?"));
   if (!statement)
     return 0;
   statement.BindInt64(0, source);
   if (!statement.Run())
     return 0;
 
@@ skipping 112 matching lines @@
 
 void ThumbnailDatabase::InitIconMappingIndex() {
   // Add an index on the url column. We ignore errors. Since this is always
   // called during startup, the index will normally already exist.
   db_.Execute("CREATE INDEX icon_mapping_page_url_idx"
               " ON icon_mapping(page_url)");
   db_.Execute("CREATE INDEX icon_mapping_icon_id_idx ON icon_mapping(icon_id)");
 }
 
 IconMappingID ThumbnailDatabase::AddIconMapping(const GURL& page_url,
-                                                FavIconID icon_id,
+                                                FaviconID icon_id,
                                                 bool is_temporary) {
   const char* name = is_temporary ? "temp_icon_mapping" : "icon_mapping";
   const char* statement_name =
       is_temporary ? "add_temp_icon_mapping" : "add_icon_mapping";
 
   std::string sql;
   sql.append("INSERT INTO ");
   sql.append(name);
   sql.append("(page_url, icon_id) VALUES (?, ?)");
 
@@ skipping 17 matching lines @@
   if (!db_.Execute("ALTER TABLE favicons ADD icon_type INTEGER DEFAULT 1")) {
     NOTREACHED();
     return false;
   }
   meta_table_.SetVersionNumber(4);
   meta_table_.SetCompatibleVersionNumber(std::min(4, kCompatibleVersionNumber));
   return true;
 }
 
 }  // namespace history