Rename FaviconBitmapXxx to FaviconRawBitmapXxx

chrome/browser/history/thumbnail_database.h

 // 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.
 
 #ifndef CHROME_BROWSER_HISTORY_THUMBNAIL_DATABASE_H_
 #define CHROME_BROWSER_HISTORY_THUMBNAIL_DATABASE_H_
 
 #include <vector>
 
 #include "base/gtest_prod_util.h"
@@ skipping 49 matching lines @@
   void TrimMemory(bool aggressively);
 
   // Favicon Bitmaps -----------------------------------------------------------
 
   // Returns true if there are favicon bitmaps for |icon_id|. If
   // |bitmap_id_sizes| is non NULL, sets it to a list of the favicon bitmap ids
   // and their associated pixel sizes for the favicon with |icon_id|.
   // The list contains results for the bitmaps which are cached in the
   // favicon_bitmaps table. The pixel sizes are a subset of the sizes in the
   // 'sizes' field of the favicons table for |icon_id|.
-  bool GetFaviconBitmapIDSizes(
+  bool GetFaviconRawBitmapIDSizes(
       favicon_base::FaviconID icon_id,
-      std::vector<FaviconBitmapIDSize>* bitmap_id_sizes);
+      std::vector<FaviconRawBitmapIDSize>* bitmap_id_sizes);
 
   // Returns true if there are any matched bitmaps for the given |icon_id|. All
   // matched results are returned if |favicon_bitmaps| is not NULL.
-  bool GetFaviconBitmaps(favicon_base::FaviconID icon_id,
-                         std::vector<FaviconBitmap>* favicon_bitmaps);
+  bool GetFaviconRawBitmaps(favicon_base::FaviconID icon_id,
+                            std::vector<FaviconRawBitmap>* favicon_bitmaps);
 
   // Gets the last updated time, bitmap data, and pixel size of the favicon
   // bitmap at |bitmap_id|. Returns true if successful.
-  bool GetFaviconBitmap(FaviconBitmapID bitmap_id,
-                        base::Time* last_updated,
-                        scoped_refptr<base::RefCountedMemory>* png_icon_data,
-                        gfx::Size* pixel_size);
+  bool GetFaviconRawBitmap(FaviconRawBitmapID bitmap_id,
+                           base::Time* last_updated,
+                           scoped_refptr<base::RefCountedMemory>* png_icon_data,
+                           gfx::Size* pixel_size);
 
   // Adds a bitmap component at |pixel_size| for the favicon with |icon_id|.
   // Only favicons representing a .ico file should have multiple favicon bitmaps
   // per favicon.
   // |icon_data| is the png encoded data.
   // The |time| indicates the access time, and is used to detect when the
   // favicon should be refreshed.
   // |pixel_size| is the pixel dimensions of |icon_data|.
   // Returns the id of the added bitmap or 0 if unsuccessful.
-  FaviconBitmapID AddFaviconBitmap(
+  FaviconRawBitmapID AddFaviconRawBitmap(
       favicon_base::FaviconID icon_id,
       const scoped_refptr<base::RefCountedMemory>& icon_data,
       base::Time time,
       const gfx::Size& pixel_size);
 
   // Sets the bitmap data and the last updated time for the favicon bitmap at
   // |bitmap_id|.
   // Returns true if successful.
-  bool SetFaviconBitmap(FaviconBitmapID bitmap_id,
-                        scoped_refptr<base::RefCountedMemory> bitmap_data,
-                        base::Time time);
+  bool SetFaviconRawBitmap(FaviconRawBitmapID bitmap_id,
+                           scoped_refptr<base::RefCountedMemory> bitmap_data,
+                           base::Time time);
 
   // Sets the last updated time for the favicon bitmap at |bitmap_id|.
   // Returns true if successful.
-  bool SetFaviconBitmapLastUpdateTime(FaviconBitmapID bitmap_id,
-                                      base::Time time);
+  bool SetFaviconRawBitmapLastUpdateTime(FaviconRawBitmapID bitmap_id,
+                                         base::Time time);
 
   // Deletes the favicon bitmap with |bitmap_id|.
   // Returns true if successful.
-  bool DeleteFaviconBitmap(FaviconBitmapID bitmap_id);
+  bool DeleteFaviconRawBitmap(FaviconRawBitmapID bitmap_id);
 
   // Favicons ------------------------------------------------------------------
 
   // Sets the the favicon as out of date. This will set |last_updated| for all
   // of the bitmaps for |icon_id| to be out of date.
   bool SetFaviconOutOfDate(favicon_base::FaviconID icon_id);
 
   // Returns the id of the entry in the favicon database with the specified url
   // and icon type. If |required_icon_type| contains multiple icon types and
   // there are more than one matched icon in database, only one icon will be
@@ skipping 10 matching lines @@
   bool GetFaviconHeader(favicon_base::FaviconID icon_id,
                         GURL* icon_url,
                         favicon_base::IconType* icon_type);
 
   // Adds favicon with |icon_url|, |icon_type| and |favicon_sizes| to the
   // favicon db, returning its id.
   favicon_base::FaviconID AddFavicon(const GURL& icon_url,
                                      favicon_base::IconType icon_type);
 
   // Adds a favicon with a single bitmap. This call is equivalent to calling
-  // AddFavicon and AddFaviconBitmap.
+  // AddFavicon and AddFaviconRawBitmap.
   favicon_base::FaviconID AddFavicon(
       const GURL& icon_url,
       favicon_base::IconType icon_type,
       const scoped_refptr<base::RefCountedMemory>& icon_data,
       base::Time time,
       const gfx::Size& pixel_size);
 
   // Delete the favicon with the provided id. Returns false on failure
   bool DeleteFavicon(favicon_base::FaviconID id);
 
@@ skipping 109 matching lines @@
   // Returns true if the |favicons| database is missing a column.
   bool IsFaviconDBStructureIncorrect();
 
   sql::Connection db_;
   sql::MetaTable meta_table_;
 };
 
 }  // namespace history
 
 #endif  // CHROME_BROWSER_HISTORY_THUMBNAIL_DATABASE_H_