Rename FaviconBitmapXxx to FaviconRawBitmapXxx

chrome/browser/history/thumbnail_database_unittest.cc

 // Copyright (c) 2012 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 <algorithm>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
@@ skipping 108 matching lines @@
   if (iter == icon_mappings.end()) {
     ADD_FAILURE() << "failed to find |expected_icon_type|";
     return false;
   }
 
   if (expected_icon_url != iter->icon_url) {
     EXPECT_EQ(expected_icon_url, iter->icon_url);
     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;
   }
 
   if (1 != favicon_bitmaps.size()) {
     EXPECT_EQ(1u, favicon_bitmaps.size());
     return false;
   }
 
   if (expected_icon_size != favicon_bitmaps[0].pixel_size) {
     EXPECT_EQ(expected_icon_size, favicon_bitmaps[0].pixel_size);
@@ skipping 104 matching lines @@
   ThumbnailDatabase db;
   ASSERT_EQ(sql::INIT_OK, db.Init(file_name_));
   db.BeginTransaction();
 
   std::vector<unsigned char> data(kBlob1, kBlob1 + sizeof(kBlob1));
   scoped_refptr<base::RefCountedBytes> favicon(new base::RefCountedBytes(data));
 
   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);
   EXPECT_LT(0, db.AddIconMapping(url, id2));
   ASSERT_NE(id, id2);
 
   std::vector<IconMapping> icon_mapping;
   EXPECT_TRUE(db.GetIconMappingsForPageURL(url, &icon_mapping));
   ASSERT_EQ(2u, icon_mapping.size());
   EXPECT_EQ(icon_mapping.front().icon_type, favicon_base::TOUCH_ICON);
@@ skipping 10 matching lines @@
   ASSERT_EQ(sql::INIT_OK, db.Init(file_name_));
   db.BeginTransaction();
 
   std::vector<unsigned char> data(kBlob1, kBlob1 + sizeof(kBlob1));
   scoped_refptr<base::RefCountedBytes> favicon(new base::RefCountedBytes(data));
 
   GURL url("http://google.com");
 
   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;
   EXPECT_TRUE(db.GetIconMappingsForPageURL(url, &icon_mappings));
   ASSERT_EQ(2u, icon_mappings.size());
   EXPECT_EQ(id1, icon_mappings[0].icon_id);
   EXPECT_EQ(id2, icon_mappings[1].icon_id);
 }
 
 TEST_F(ThumbnailDatabaseTest, RetainDataForPageUrls) {
@@ skipping 10 matching lines @@
 
   // TODO(shess): This would probably make sense as a golden file.
 
   scoped_refptr<base::RefCountedStaticMemory> favicon1(
       new base::RefCountedStaticMemory(kBlob1, sizeof(kBlob1)));
   scoped_refptr<base::RefCountedStaticMemory> favicon2(
       new base::RefCountedStaticMemory(kBlob2, sizeof(kBlob2)));
 
   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.
   // Grab a copy of the schema to make sure the final schema matches.
   const std::string original_schema = db.db_.GetSchema();
 
   std::vector<GURL> pages_to_keep;
   pages_to_keep.push_back(kPageUrl1);
   pages_to_keep.push_back(kPageUrl3);
   pages_to_keep.push_back(kPageUrl5);
@@ skipping 39 matching lines @@
   std::vector<unsigned char> data1(kBlob1, kBlob1 + sizeof(kBlob1));
   scoped_refptr<base::RefCountedBytes> favicon1(
       new base::RefCountedBytes(data1));
   std::vector<unsigned char> data2(kBlob2, kBlob2 + sizeof(kBlob2));
   scoped_refptr<base::RefCountedBytes> favicon2(
       new base::RefCountedBytes(data2));
 
   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) {
   ThumbnailDatabase db;
   ASSERT_EQ(sql::INIT_OK, db.Init(file_name_));
   db.BeginTransaction();
 
   // Add a favicon
   std::vector<unsigned char> data(kBlob1, kBlob1 + sizeof(kBlob1));
   scoped_refptr<base::RefCountedBytes> favicon(new base::RefCountedBytes(data));
@@ skipping 168 matching lines @@
   db.BeginTransaction();
 
   std::vector<unsigned char> data(kBlob1, kBlob1 + sizeof(kBlob1));
   scoped_refptr<base::RefCountedBytes> favicon(new base::RefCountedBytes(data));
 
   // Add a favicon which will have icon_mappings
   favicon_base::FaviconID id1 =
       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));
   EXPECT_TRUE(db.AddIconMapping(page1_url, id2));
 
   GURL page2_url("http://page2.com");
   EXPECT_TRUE(db.AddIconMapping(page2_url, id3));
 
   // Test we do nothing with existing mappings.
   std::vector<IconMapping> icon_mapping;
@@ skipping 408 matching lines @@
     ThumbnailDatabase db;
     ASSERT_EQ(sql::INIT_OK, db.Init(db_path));
 
     // Verify that the resulting schema is correct, whether it
     // involved razing the file or fixing things in place.
     VerifyTablesAndColumns(&db.db_);
   }
 }
 
 }  // namespace history