Rename FaviconBitmapXxx to FaviconRawBitmapXxx

chrome/browser/history/thumbnail_database.cc

Index: chrome/browser/history/thumbnail_database.cc
diff --git a/chrome/browser/history/thumbnail_database.cc b/chrome/browser/history/thumbnail_database.cc
index 80f4559563118eea1d263d371a2337fd4ecd3a30..a82e533121cb1eebec869e489fc66f5faea0f7f8 100644
--- a/chrome/browser/history/thumbnail_database.cc
+++ b/chrome/browser/history/thumbnail_database.cc
@@ -300,7 +300,7 @@ bool InitTables(sql::Connection* db) {
   if (!db->Execute(kFaviconsSql))
     return false;
 
-  const char kFaviconBitmapsSql[] =
+  const char kFaviconRawBitmapsSql[] =
       "CREATE TABLE IF NOT EXISTS favicon_bitmaps"
       "("
       "id INTEGER PRIMARY KEY,"
@@ -310,7 +310,7 @@ bool InitTables(sql::Connection* db) {
       "width INTEGER DEFAULT 0,"
       "height INTEGER DEFAULT 0"
       ")";
-  if (!db->Execute(kFaviconBitmapsSql))
+  if (!db->Execute(kFaviconRawBitmapsSql))
     return false;
 
   return true;
@@ -336,10 +336,10 @@ bool InitIndices(sql::Connection* db) {
   if (!db->Execute(kFaviconsIndexSql))
     return false;
 
-  const char kFaviconBitmapsIndexSql[] =
+  const char kFaviconRawBitmapsIndexSql[] =
       "CREATE INDEX IF NOT EXISTS favicon_bitmaps_icon_id ON "
       "favicon_bitmaps(icon_id)";
-  if (!db->Execute(kFaviconBitmapsIndexSql))
+  if (!db->Execute(kFaviconRawBitmapsIndexSql))
     return false;
 
   return true;
@@ -531,7 +531,7 @@ void RecoverDatabaseOrRaze(sql::Connection* db, const base::FilePath& db_path) {
   // probably means there's something wrong with the profile.
   UMA_HISTOGRAM_COUNTS_10000("History.FaviconsRecoveredRowsFavicons",
                              favicons_rows_recovered);
-  UMA_HISTOGRAM_COUNTS_10000("History.FaviconsRecoveredRowsFaviconBitmaps",
+  UMA_HISTOGRAM_COUNTS_10000("History.FaviconsRecoveredRowsFaviconRawBitmaps",
                              favicon_bitmaps_rows_recovered);
   UMA_HISTOGRAM_COUNTS_10000("History.FaviconsRecoveredRowsIconMapping",
                              icon_mapping_rows_recovered);
@@ -645,9 +645,9 @@ void ThumbnailDatabase::TrimMemory(bool aggressively) {
   db_.TrimMemory(aggressively);
 }
 
-bool ThumbnailDatabase::GetFaviconBitmapIDSizes(
+bool ThumbnailDatabase::GetFaviconRawBitmapIDSizes(
     favicon_base::FaviconID icon_id,
-    std::vector<FaviconBitmapIDSize>* bitmap_id_sizes) {
+    std::vector<FaviconRawBitmapIDSize>* bitmap_id_sizes) {
   DCHECK(icon_id);
   sql::Statement statement(db_.GetCachedStatement(SQL_FROM_HERE,
       "SELECT id, width, height FROM favicon_bitmaps WHERE icon_id=?"));
@@ -659,7 +659,7 @@ bool ThumbnailDatabase::GetFaviconBitmapIDSizes(
     if (!bitmap_id_sizes)
       return result;
 
-    FaviconBitmapIDSize bitmap_id_size;
+    FaviconRawBitmapIDSize bitmap_id_size;
     bitmap_id_size.bitmap_id = statement.ColumnInt64(0);
     bitmap_id_size.pixel_size = gfx::Size(statement.ColumnInt(1),
                                           statement.ColumnInt(2));
@@ -668,9 +668,9 @@ bool ThumbnailDatabase::GetFaviconBitmapIDSizes(
   return result;
 }
 
-bool ThumbnailDatabase::GetFaviconBitmaps(
+bool ThumbnailDatabase::GetFaviconRawBitmaps(
     favicon_base::FaviconID icon_id,
-    std::vector<FaviconBitmap>* favicon_bitmaps) {
+    std::vector<FaviconRawBitmap>* favicon_bitmaps) {
   DCHECK(icon_id);
   sql::Statement statement(db_.GetCachedStatement(SQL_FROM_HERE,
       "SELECT id, last_updated, image_data, width, height FROM favicon_bitmaps "
@@ -683,7 +683,7 @@ bool ThumbnailDatabase::GetFaviconBitmaps(
     if (!favicon_bitmaps)
       return result;
 
-    FaviconBitmap favicon_bitmap;
+    FaviconRawBitmap favicon_bitmap;
     favicon_bitmap.bitmap_id = statement.ColumnInt64(0);
     favicon_bitmap.icon_id = icon_id;
     favicon_bitmap.last_updated =
@@ -700,8 +700,8 @@ bool ThumbnailDatabase::GetFaviconBitmaps(
   return result;
 }
 
-bool ThumbnailDatabase::GetFaviconBitmap(
-    FaviconBitmapID bitmap_id,
+bool ThumbnailDatabase::GetFaviconRawBitmap(
+    FaviconRawBitmapID bitmap_id,
     base::Time* last_updated,
     scoped_refptr<base::RefCountedMemory>* png_icon_data,
     gfx::Size* pixel_size) {
@@ -730,7 +730,7 @@ bool ThumbnailDatabase::GetFaviconBitmap(
   return true;
 }
 
-FaviconBitmapID ThumbnailDatabase::AddFaviconBitmap(
+FaviconRawBitmapID ThumbnailDatabase::AddFaviconRawBitmap(
     favicon_base::FaviconID icon_id,
     const scoped_refptr<base::RefCountedMemory>& icon_data,
     base::Time time,
@@ -755,8 +755,8 @@ FaviconBitmapID ThumbnailDatabase::AddFaviconBitmap(
   return db_.GetLastInsertRowId();
 }
 
-bool ThumbnailDatabase::SetFaviconBitmap(
-    FaviconBitmapID bitmap_id,
+bool ThumbnailDatabase::SetFaviconRawBitmap(
+    FaviconRawBitmapID bitmap_id,
     scoped_refptr<base::RefCountedMemory> bitmap_data,
     base::Time time) {
   DCHECK(bitmap_id);
@@ -774,8 +774,8 @@ bool ThumbnailDatabase::SetFaviconBitmap(
   return statement.Run();
 }
 
-bool ThumbnailDatabase::SetFaviconBitmapLastUpdateTime(
-    FaviconBitmapID bitmap_id,
+bool ThumbnailDatabase::SetFaviconRawBitmapLastUpdateTime(
+    FaviconRawBitmapID bitmap_id,
     base::Time time) {
   DCHECK(bitmap_id);
   sql::Statement statement(db_.GetCachedStatement(SQL_FROM_HERE,
@@ -785,7 +785,7 @@ bool ThumbnailDatabase::SetFaviconBitmapLastUpdateTime(
   return statement.Run();
 }
 
-bool ThumbnailDatabase::DeleteFaviconBitmap(FaviconBitmapID bitmap_id) {
+bool ThumbnailDatabase::DeleteFaviconRawBitmap(FaviconRawBitmapID bitmap_id) {
   sql::Statement statement(db_.GetCachedStatement(SQL_FROM_HERE,
       "DELETE FROM favicon_bitmaps WHERE id=?"));
   statement.BindInt64(0, bitmap_id);
@@ -860,7 +860,7 @@ favicon_base::FaviconID ThumbnailDatabase::AddFavicon(
     base::Time time,
     const gfx::Size& pixel_size) {
   favicon_base::FaviconID icon_id = AddFavicon(icon_url, icon_type);
-  if (!icon_id || !AddFaviconBitmap(icon_id, icon_data, time, pixel_size))
+  if (!icon_id || !AddFaviconRawBitmap(icon_id, icon_data, time, pixel_size))
     return 0;
 
   return icon_id;
@@ -1073,9 +1073,9 @@ bool ThumbnailDatabase::RetainDataForPageUrls(
       "ON (old.id = mapping.old_icon_id)";
   const char kDropOldFaviconsTable[] = "DROP TABLE old_favicons";
 
-  const char kRenameFaviconBitmapsTable[] =
+  const char kRenameFaviconRawBitmapsTable[] =
       "ALTER TABLE favicon_bitmaps RENAME TO old_favicon_bitmaps";
-  const char kCopyFaviconBitmaps[] =
+  const char kCopyFaviconRawBitmaps[] =
       "INSERT INTO favicon_bitmaps "
       "  (icon_id, last_updated, image_data, width, height) "
       "SELECT mapping.new_icon_id, old.last_updated, "
@@ -1083,13 +1083,13 @@ bool ThumbnailDatabase::RetainDataForPageUrls(
       "FROM old_favicon_bitmaps AS old "
       "JOIN temp.icon_id_mapping AS mapping "
       "ON (old.icon_id = mapping.old_icon_id)";
-  const char kDropOldFaviconBitmapsTable[] =
+  const char kDropOldFaviconRawBitmapsTable[] =
       "DROP TABLE old_favicon_bitmaps";
 
   // Rename existing tables to new location.
   if (!db_.Execute(kRenameIconMappingTable) ||
       !db_.Execute(kRenameFaviconsTable) ||
-      !db_.Execute(kRenameFaviconBitmapsTable)) {
+      !db_.Execute(kRenameFaviconRawBitmapsTable)) {
     return false;
   }
 
@@ -1100,16 +1100,15 @@ bool ThumbnailDatabase::RetainDataForPageUrls(
     return false;
 
   // Copy all of the data over.
-  if (!db_.Execute(kCopyIconMapping) ||
-      !db_.Execute(kCopyFavicons) ||
-      !db_.Execute(kCopyFaviconBitmaps)) {
+  if (!db_.Execute(kCopyIconMapping) || !db_.Execute(kCopyFavicons) ||
+      !db_.Execute(kCopyFaviconRawBitmaps)) {
     return false;
   }
 
   // Drop the old_* tables, which also drops the indices.
   if (!db_.Execute(kDropOldIconMappingTable) ||
       !db_.Execute(kDropOldFaviconsTable) ||
-      !db_.Execute(kDropOldFaviconBitmapsTable)) {
+      !db_.Execute(kDropOldFaviconRawBitmapsTable)) {
     return false;
   }