Adds support for saving favicon size into history database.

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 82218fa9436cccad76e69c797bd6d6a6bcd59604..e177af8e626ffd35b012418bf7337e24caeec772 100644
--- a/chrome/browser/history/history_types.h
+++ b/chrome/browser/history/history_types.h
@@ -677,6 +677,9 @@ struct IconMapping {
   // The unique id of the icon.
   FaviconID icon_id;
 
+  // The url of the icon.
+  GURL icon_url;
+
   // The type of icon.
   IconType icon_type;
 };
@@ -706,6 +709,10 @@ struct FaviconBitmapResult {
   IconType icon_type;
 };
 
+// Define type with same structure as FaviconBitmapResult for passing data to
+// HistoryBackend::SetFavicons().
+typedef FaviconBitmapResult FaviconBitmapData;
+
 // Defines a gfx::Image of size desired_size_in_dip composed of image
 // representations for each of the desired scale factors.
 struct FaviconImageResult {
@@ -739,6 +746,18 @@ const FaviconSizes& GetDefaultFaviconSizes();
 // A map from an icon URL to the FaviconSizes for that URL.
 typedef std::map<GURL, FaviconSizes> IconURLSizesMap;
 
+// Defines a favicon bitmap and its associated pixel size.
+struct FaviconBitmapIDSize {
+  FaviconBitmapIDSize();
+  ~FaviconBitmapIDSize();
+
+  // The unique id of the favicon bitmap.
+  FaviconBitmapID 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();