Rename FaviconBitmapXxx to FaviconRawBitmapXxx

chrome/browser/history/thumbnail_database_unittest.cc

Index: chrome/browser/history/thumbnail_database_unittest.cc
diff --git a/chrome/browser/history/thumbnail_database_unittest.cc b/chrome/browser/history/thumbnail_database_unittest.cc
index 99a3e533d368a123e16a277c77cc2ebe732060a9..03cbe03dece0f905bc578c739d1691b3f1894d41 100644
--- a/chrome/browser/history/thumbnail_database_unittest.cc
+++ b/chrome/browser/history/thumbnail_database_unittest.cc
@@ -126,9 +126,9 @@ WARN_UNUSED_RESULT bool CheckPageHasIcon(
     return false;
   }
 
-  std::vector<FaviconBitmap> favicon_bitmaps;
-  if (!db->GetFaviconBitmaps(iter->icon_id, &favicon_bitmaps)) {
-    ADD_FAILURE() << "failed GetFaviconBitmaps()";
+  std::vector<FaviconRawBitmap> favicon_bitmaps;
+  if (!db->GetFaviconRawBitmaps(iter->icon_id, &favicon_bitmaps)) {
+    ADD_FAILURE() << "failed GetFaviconRawBitmaps()";
     return false;
   }
 
@@ -253,7 +253,7 @@ TEST_F(ThumbnailDatabaseTest, DeleteIconMappings) {
   GURL url("http://google.com");
   favicon_base::FaviconID id = db.AddFavicon(url, favicon_base::TOUCH_ICON);
   base::Time time = base::Time::Now();
-  db.AddFaviconBitmap(id, favicon, time, gfx::Size());
+  db.AddFaviconRawBitmap(id, favicon, time, gfx::Size());
   EXPECT_LT(0, db.AddIconMapping(url, id));
 
   favicon_base::FaviconID id2 = db.AddFavicon(url, favicon_base::FAVICON);
@@ -284,13 +284,13 @@ TEST_F(ThumbnailDatabaseTest, GetIconMappingsForPageURL) {
 
   favicon_base::FaviconID id1 = db.AddFavicon(url, favicon_base::TOUCH_ICON);
   base::Time time = base::Time::Now();
-  db.AddFaviconBitmap(id1, favicon, time, kSmallSize);
-  db.AddFaviconBitmap(id1, favicon, time, kLargeSize);
+  db.AddFaviconRawBitmap(id1, favicon, time, kSmallSize);
+  db.AddFaviconRawBitmap(id1, favicon, time, kLargeSize);
   EXPECT_LT(0, db.AddIconMapping(url, id1));
 
   favicon_base::FaviconID id2 = db.AddFavicon(url, favicon_base::FAVICON);
   EXPECT_NE(id1, id2);
-  db.AddFaviconBitmap(id2, favicon, time, kSmallSize);
+  db.AddFaviconRawBitmap(id2, favicon, time, kSmallSize);
   EXPECT_LT(0, db.AddIconMapping(url, id2));
 
   std::vector<IconMapping> icon_mappings;
@@ -321,18 +321,18 @@ TEST_F(ThumbnailDatabaseTest, RetainDataForPageUrls) {
 
   favicon_base::FaviconID kept_id1 =
       db.AddFavicon(kIconUrl1, favicon_base::FAVICON);
-  db.AddFaviconBitmap(kept_id1, favicon1, base::Time::Now(), kLargeSize);
+  db.AddFaviconRawBitmap(kept_id1, favicon1, base::Time::Now(), kLargeSize);
   db.AddIconMapping(kPageUrl1, kept_id1);
   db.AddIconMapping(kPageUrl3, kept_id1);
 
   favicon_base::FaviconID unkept_id =
       db.AddFavicon(kIconUrl2, favicon_base::FAVICON);
-  db.AddFaviconBitmap(unkept_id, favicon1, base::Time::Now(), kLargeSize);
+  db.AddFaviconRawBitmap(unkept_id, favicon1, base::Time::Now(), kLargeSize);
   db.AddIconMapping(kPageUrl2, unkept_id);
 
   favicon_base::FaviconID kept_id2 =
       db.AddFavicon(kIconUrl5, favicon_base::FAVICON);
-  db.AddFaviconBitmap(kept_id2, favicon2, base::Time::Now(), kLargeSize);
+  db.AddFaviconRawBitmap(kept_id2, favicon2, base::Time::Now(), kLargeSize);
   db.AddIconMapping(kPageUrl5, kept_id2);
 
   // RetainDataForPageUrls() uses schema manipulations for efficiency.
@@ -392,13 +392,13 @@ TEST_F(ThumbnailDatabaseTest, DeleteFavicon) {
   GURL url("http://google.com");
   favicon_base::FaviconID id = db.AddFavicon(url, favicon_base::FAVICON);
   base::Time last_updated = base::Time::Now();
-  db.AddFaviconBitmap(id, favicon1, last_updated, kSmallSize);
-  db.AddFaviconBitmap(id, favicon2, last_updated, kLargeSize);
+  db.AddFaviconRawBitmap(id, favicon1, last_updated, kSmallSize);
+  db.AddFaviconRawBitmap(id, favicon2, last_updated, kLargeSize);
 
-  EXPECT_TRUE(db.GetFaviconBitmaps(id, NULL));
+  EXPECT_TRUE(db.GetFaviconRawBitmaps(id, NULL));
 
   EXPECT_TRUE(db.DeleteFavicon(id));
-  EXPECT_FALSE(db.GetFaviconBitmaps(id, NULL));
+  EXPECT_FALSE(db.GetFaviconRawBitmaps(id, NULL));
 }
 
 TEST_F(ThumbnailDatabaseTest, GetIconMappingsForPageURLForReturnOrder) {
@@ -587,21 +587,21 @@ TEST_F(ThumbnailDatabaseTest, CloneIconMappings) {
       db.AddFavicon(GURL("http://google.com"), favicon_base::FAVICON);
   EXPECT_NE(0, id1);
   base::Time time = base::Time::Now();
-  db.AddFaviconBitmap(id1, favicon, time, gfx::Size());
+  db.AddFaviconRawBitmap(id1, favicon, time, gfx::Size());
 
   // Add another type of favicon
   favicon_base::FaviconID id2 = db.AddFavicon(
       GURL("http://www.google.com/icon"), favicon_base::TOUCH_ICON);
   EXPECT_NE(0, id2);
   time = base::Time::Now();
-  db.AddFaviconBitmap(id2, favicon, time, gfx::Size());
+  db.AddFaviconRawBitmap(id2, favicon, time, gfx::Size());
 
   // Add 3rd favicon
   favicon_base::FaviconID id3 = db.AddFavicon(
       GURL("http://www.google.com/icon"), favicon_base::TOUCH_ICON);
   EXPECT_NE(0, id3);
   time = base::Time::Now();
-  db.AddFaviconBitmap(id3, favicon, time, gfx::Size());
+  db.AddFaviconRawBitmap(id3, favicon, time, gfx::Size());
 
   GURL page1_url("http://page1.com");
   EXPECT_TRUE(db.AddIconMapping(page1_url, id1));