Adds support for saving favicon size into history database.

chrome/browser/history/thumbnail_database.h

Index: chrome/browser/history/thumbnail_database.h
diff --git a/chrome/browser/history/thumbnail_database.h b/chrome/browser/history/thumbnail_database.h
index a3cf663a6342ce71e976155fd320050f8322f1d7..45000e5ae484f3f498eead557da3da55478dc8a1 100644
--- a/chrome/browser/history/thumbnail_database.h
+++ b/chrome/browser/history/thumbnail_database.h
@@ -99,11 +99,33 @@ class ThumbnailDatabase {
 
   // Favicon Bitmaps -----------------------------------------------------------
 
+  // Returns true if there are favicon bitmaps for |icon_id|. If
+  // |bitmap_size_listing| is non NULL, sets it to a listing of the favicon
+  // bitmap ids and their associated pixel sizes for the favicon with
+  // |icon_id|.

[sky, 2012/09/05 00:15:51]

Document this is the actual sizes we have, which may be a subset of those
available for the id.

+  bool GetFaviconBitmapIDSizes(
+      FaviconID icon_id,
+      std::vector<FaviconBitmapIDSize>* 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(FaviconID icon_id,
                          std::vector<FaviconBitmap>* 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);
+
+  // 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);
+
   // 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.
@@ -118,9 +140,9 @@ class ThumbnailDatabase {
       base::Time time,
       const gfx::Size& pixel_size);
 
-  // Deletes the favicon bitmaps for the favicon with with |icon_id|.
+  // Deletes the favicon bitmap with |bitmap_id|.
   // Returns true if successful.
-  bool DeleteFaviconBitmapsForFavicon(FaviconID icon_id);
+  bool DeleteFaviconBitmap(FaviconBitmapID bitmap_id);
 
   // Favicons ------------------------------------------------------------------
 
@@ -204,6 +226,10 @@ class ThumbnailDatabase {
   // Returns true if the deletion succeeded.
   bool DeleteIconMappings(const GURL& page_url);
 
+  // Deletes the icon mapping with |mapping_id|.
+  // Returns true if the deletion succeeded.
+  bool DeleteIconMapping(IconMappingID mapping_id);
+
   // Checks whether a favicon is used by any URLs in the database.
   bool HasMappingFor(FaviconID id);