Adds support for saving favicon size into history database.

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 81 matching lines @@
   // current thumbnail score and places it in |score| and returns
   // true. Returns false otherwise.
   bool ThumbnailScoreForId(URLID id, ThumbnailScore* score);
 
   // Called by the to delete all old thumbnails and make a clean table.
   // Returns true on success.
   bool RecreateThumbnailTable();
 
   // 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.
   // |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(
       FaviconID icon_id,
       const scoped_refptr<base::RefCountedMemory>& icon_data,
       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 ------------------------------------------------------------------
 
   // Updates the favicon sizes associated with a favicon to |favicon_sizes|.
   // See comment in history_types.h for description of |favicon_sizes|.
   bool SetFaviconSizes(FaviconID icon_id, const FaviconSizes& favicon_sizes);
 
   // 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(FaviconID icon_id);
@@ skipping 63 matching lines @@
 
   // Updates the page and icon mapping for the given mapping_id with the given
   // icon_id.
   // Returns true if the update succeeded.
   bool UpdateIconMapping(IconMappingID mapping_id, FaviconID icon_id);
 
   // Deletes the icon mapping entries for the given page url.
   // 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);
 
   // Clones the existing mappings from |old_page_url| if |new_page_url| has no
   // mappings. Otherwise, will leave mappings alone.
   bool CloneIconMappings(const GURL& old_page_url, const GURL& new_page_url);
 
   // The class to enumerate icon mappings. Use InitIconMappingEnumerator to
   // initialize.
   class IconMappingEnumerator {
@@ skipping 164 matching lines @@
   const HistoryPublisher* history_publisher_;
 
   // True if migration to TopSites has been done and the thumbnails
   // table should not be used.
   bool use_top_sites_;
 };
 
 }  // namespace history
 
 #endif  // CHROME_BROWSER_HISTORY_THUMBNAIL_DATABASE_H_