Adds support for saving favicon size into history database.

chrome/browser/history/history.cc

Index: chrome/browser/history/history.cc
diff --git a/chrome/browser/history/history.cc b/chrome/browser/history/history.cc
index 648de2963dd020abb15ab4cbc4f21a08d057b0e6..4420af5d4b2798f246d491f28743b1234a780daf 100644
--- a/chrome/browser/history/history.cc
+++ b/chrome/browser/history/history.cc
@@ -493,26 +493,29 @@ HistoryService::Handle HistoryService::GetPageThumbnail(
 
 void HistoryService::GetFavicon(FaviconService::GetFaviconRequest* request,
                                 const GURL& icon_url,
+                                const gfx::Size& pixel_size,
                                 history::IconType icon_type) {
   Schedule(PRIORITY_NORMAL, &HistoryBackend::GetFavicon, NULL, request,
-           icon_url, icon_type);
+           icon_url, pixel_size, icon_type);
 }
 
 void HistoryService::UpdateFaviconMappingAndFetch(
     FaviconService::GetFaviconRequest* request,
     const GURL& page_url,
     const GURL& icon_url,
+    const gfx::Size& pixel_size,
     history::IconType icon_type) {
   Schedule(PRIORITY_NORMAL, &HistoryBackend::UpdateFaviconMappingAndFetch, NULL,
-           request, page_url, icon_url, history::FAVICON);
+           request, page_url, icon_url, pixel_size, history::FAVICON);
 }
 
 void HistoryService::GetFaviconForURL(
     FaviconService::GetFaviconRequest* request,
     const GURL& page_url,
+    const gfx::Size& pixel_size,
     int icon_types) {
   Schedule(PRIORITY_NORMAL, &HistoryBackend::GetFaviconForURL, NULL, request,
-           page_url, icon_types);
+           page_url, pixel_size, icon_types);
 }
 
 void HistoryService::GetFaviconForID(FaviconService::GetFaviconRequest* request,
@@ -524,6 +527,7 @@ void HistoryService::GetFaviconForID(FaviconService::GetFaviconRequest* request,
 void HistoryService::SetFavicon(const GURL& page_url,
                                 const GURL& icon_url,
                                 const std::vector<unsigned char>& image_data,
+                                const gfx::Size& requested_size,
                                 history::IconType icon_type) {
   if (!CanAddURL(page_url))
     return;
@@ -532,7 +536,7 @@ void HistoryService::SetFavicon(const GURL& page_url,
       page_url, icon_url,
       scoped_refptr<base::RefCountedMemory>(
           new base::RefCountedBytes(image_data)),
-      icon_type);
+      requested_size, icon_type);
 }
 
 void HistoryService::SetFaviconOutOfDateForPage(const GURL& page_url) {