Rename FaviconBitmapXxx to FaviconRawBitmapXxx

chrome/browser/history/android/android_provider_backend_unittest.cc

Index: chrome/browser/history/android/android_provider_backend_unittest.cc
diff --git a/chrome/browser/history/android/android_provider_backend_unittest.cc b/chrome/browser/history/android/android_provider_backend_unittest.cc
index 4eb1e6150b168b8e14264230dd8b3ae61971a41f..591cab75b5f4c4fe5d247d26503fe09570cd2f55 100644
--- a/chrome/browser/history/android/android_provider_backend_unittest.cc
+++ b/chrome/browser/history/android/android_provider_backend_unittest.cc
@@ -256,11 +256,11 @@ TEST_F(AndroidProviderBackendTest, UpdateTables) {
   // Set favicon to url2.
   std::vector<unsigned char> data;
   data.push_back('1');
-  favicon_base::FaviconBitmapData bitmap_data_element;
+  favicon_base::FaviconRawBitmapData bitmap_data_element;
   bitmap_data_element.bitmap_data = new base::RefCountedBytes(data);
   bitmap_data_element.pixel_size = gfx::Size();
   bitmap_data_element.icon_url = GURL();
-  std::vector<favicon_base::FaviconBitmapData> favicon_bitmap_data;
+  std::vector<favicon_base::FaviconRawBitmapData> favicon_bitmap_data;
   favicon_bitmap_data.push_back(bitmap_data_element);
 
   history_backend->SetFavicons(
@@ -409,11 +409,11 @@ TEST_F(AndroidProviderBackendTest, QueryHistoryAndBookmarks) {
   // Set favicon to url2.
   std::vector<unsigned char> data;
   data.push_back('1');
-  favicon_base::FaviconBitmapData bitmap_data_element;
+  favicon_base::FaviconRawBitmapData bitmap_data_element;
   bitmap_data_element.bitmap_data = new base::RefCountedBytes(data);
   bitmap_data_element.pixel_size = gfx::Size();
   bitmap_data_element.icon_url = GURL();
-  std::vector<favicon_base::FaviconBitmapData> favicon_bitmap_data;
+  std::vector<favicon_base::FaviconRawBitmapData> favicon_bitmap_data;
   favicon_bitmap_data.push_back(bitmap_data_element);
 
   history_backend->SetFavicons(
@@ -1188,9 +1188,9 @@ TEST_F(AndroidProviderBackendTest, UpdateFavicon) {
   EXPECT_TRUE(thumbnail_db_.GetIconMappingsForPageURL(
       row1.url(), favicon_base::FAVICON, &icon_mappings));
   EXPECT_EQ(1u, icon_mappings.size());
-  std::vector<FaviconBitmap> favicon_bitmaps;
-  EXPECT_TRUE(thumbnail_db_.GetFaviconBitmaps(icon_mappings[0].icon_id,
-                                              &favicon_bitmaps));
+  std::vector<FaviconRawBitmap> favicon_bitmaps;
+  EXPECT_TRUE(thumbnail_db_.GetFaviconRawBitmaps(icon_mappings[0].icon_id,
+                                                 &favicon_bitmaps));
   EXPECT_EQ(1u, favicon_bitmaps.size());
   EXPECT_TRUE(favicon_bitmaps[0].bitmap_data.get());
   EXPECT_EQ(1u, favicon_bitmaps[0].bitmap_data->size());
@@ -1860,11 +1860,11 @@ TEST_F(AndroidProviderBackendTest, QueryWithoutThumbnailDB) {
   // Set favicon to url2.
   std::vector<unsigned char> data;
   data.push_back('1');
-  favicon_base::FaviconBitmapData bitmap_data_element;
+  favicon_base::FaviconRawBitmapData bitmap_data_element;
   bitmap_data_element.bitmap_data = new base::RefCountedBytes(data);
   bitmap_data_element.pixel_size = gfx::Size();
   bitmap_data_element.icon_url = GURL();
-  std::vector<favicon_base::FaviconBitmapData> favicon_bitmap_data;
+  std::vector<favicon_base::FaviconRawBitmapData> favicon_bitmap_data;
   favicon_bitmap_data.push_back(bitmap_data_element);
 
   history_backend->SetFavicons(