Rename FaviconBitmapXxx to FaviconRawBitmapXxx

chrome/browser/history/android/android_provider_backend_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 "chrome/browser/history/android/android_provider_backend.h"
 
 #include <vector>
 
 #include "base/file_util.h"
 #include "base/files/file_path.h"
@@ skipping 238 matching lines @@
   URLRow url_row;
 
   ASSERT_TRUE(history_backend->GetURL(url1, &url_row));
   url_id1 = url_row.id();
   ASSERT_TRUE(history_backend->GetURL(url2, &url_row));
   url_id2 = url_row.id();
 
   // 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(
       url2, favicon_base::FAVICON, favicon_bitmap_data);
   history_backend->Closing();
   }
 
   // The history_db_name and thumbnail_db_name files should be created by
   // HistoryBackend. We need to open the same database files.
   ASSERT_TRUE(base::PathExists(history_db_name_));
@@ skipping 128 matching lines @@
   ASSERT_TRUE(history_backend->UpdateURL(url_id1, url_row));
 
   ASSERT_TRUE(history_backend->GetURL(url2, &url_row));
   url_id2 = url_row.id();
   url_row.set_title(title2);
   ASSERT_TRUE(history_backend->UpdateURL(url_id2, url_row));
 
   // 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(
       url2, favicon_base::FAVICON, favicon_bitmap_data);
   history_backend->Closing();
   }
 
   // The history_db_name and thumbnail_db_name files should be created by
   // HistoryBackend. We need to open the same database files.
   ASSERT_TRUE(base::PathExists(history_db_name_));
@@ skipping 754 matching lines @@
   EXPECT_FALSE(delegate_.modified_details());
   ASSERT_TRUE(delegate_.favicon_details());
   ASSERT_EQ(1u, delegate_.favicon_details()->urls.size());
   ASSERT_TRUE(delegate_.favicon_details()->urls.end() !=
               delegate_.favicon_details()->urls.find(row1.url()));
 
   std::vector<IconMapping> icon_mappings;
   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());
   EXPECT_EQ('1', *favicon_bitmaps[0].bitmap_data->front());
 
   // Remove favicon.
   HistoryAndBookmarkRow update_row2;
 
   // Set favicon.
   update_row1.set_favicon(new base::RefCountedBytes());
@@ skipping 649 matching lines @@
   ASSERT_TRUE(history_backend->UpdateURL(url_id1, url_row));
 
   ASSERT_TRUE(history_backend->GetURL(url2, &url_row));
   url_id2 = url_row.id();
   url_row.set_title(title2);
   ASSERT_TRUE(history_backend->UpdateURL(url_id2, url_row));
 
   // 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(
       url2, favicon_base::FAVICON, favicon_bitmap_data);
   history_backend->Closing();
   }
 
   // The history_db_name and thumbnail_db_name files should be created by
   // HistoryBackend. We need to open the same database files.
   ASSERT_TRUE(base::PathExists(history_db_name_));
@@ skipping 257 matching lines @@
                                                  update_args, &update_count));
   // Verify notifications.
   EXPECT_FALSE(delegate_.deleted_details());
   ASSERT_TRUE(delegate_.modified_details());
   ASSERT_EQ(1u, delegate_.modified_details()->changed_urls.size());
   // No favicon will be updated as thumbnail database is missing.
   EXPECT_FALSE(delegate_.favicon_details());
 }
 
 }  // namespace history