Rename FaviconBitmapXxx to FaviconRawBitmapXxx

chrome/browser/history/history_types.h

Index: chrome/browser/history/history_types.h
diff --git a/chrome/browser/history/history_types.h b/chrome/browser/history/history_types.h
index 2a392bcfb12374b947ad892ccd8829e640870e25..9a51f6b0774b4134d7f5e1c646cd4b47cb1e6aa5 100644
--- a/chrome/browser/history/history_types.h
+++ b/chrome/browser/history/history_types.h
@@ -42,7 +42,7 @@ typedef std::map<GURL, scoped_refptr<RefCountedVector<GURL> > > RedirectMap;
 // Container for a list of URLs.
 typedef std::vector<GURL> RedirectList;
 
-typedef int64 FaviconBitmapID; // Identifier for a bitmap in a favicon.
+typedef int64 FaviconRawBitmapID;  // Identifier for a bitmap in a favicon.
 typedef int64 SegmentID;  // URL segments for the most visited view.
 typedef int64 IconMappingID; // For page url and icon mapping.
 
@@ -698,24 +698,24 @@ struct IconMapping {
 };
 
 // Defines a favicon bitmap and its associated pixel size.
-struct FaviconBitmapIDSize {
-  FaviconBitmapIDSize();
-  ~FaviconBitmapIDSize();
+struct FaviconRawBitmapIDSize {
+  FaviconRawBitmapIDSize();
+  ~FaviconRawBitmapIDSize();
 
   // The unique id of the favicon bitmap.
-  FaviconBitmapID bitmap_id;
+  FaviconRawBitmapID bitmap_id;
 
   // The pixel dimensions of the associated bitmap.
   gfx::Size pixel_size;
 };
 
 // Defines a favicon bitmap stored in the history backend.
-struct FaviconBitmap {
-  FaviconBitmap();
-  ~FaviconBitmap();
+struct FaviconRawBitmap {
+  FaviconRawBitmap();
+  ~FaviconRawBitmap();
 
   // The unique id of the bitmap.
-  FaviconBitmapID bitmap_id;
+  FaviconRawBitmapID bitmap_id;
 
   // The id of the favicon to which the bitmap belongs to.
   favicon_base::FaviconID icon_id;