Adds support for saving favicon size into history database.

chrome/browser/favicon/favicon_service.h

Index: chrome/browser/favicon/favicon_service.h
diff --git a/chrome/browser/favicon/favicon_service.h b/chrome/browser/favicon/favicon_service.h
index d122dd64bda74871cb4e9e8cf22ba3a6be1dfeb4..6a06948ed591f1a46ace6439e4665c2f5674f682 100644
--- a/chrome/browser/favicon/favicon_service.h
+++ b/chrome/browser/favicon/favicon_service.h
@@ -31,12 +31,17 @@ class FaviconService : public CancelableRequestProvider {
   // for this URL, |know_favicon| will be true, and the rest of the fields will
   // be valid (otherwise they will be ignored).
   //
-  // On |know_favicon| == true, |data| will either contain the PNG encoded
-  // favicon data, or it will be NULL to indicate that the site does not have
-  // a favicon (in other words, we know the site doesn't have a favicon, as
-  // opposed to not knowing anything). |expired| will be set to true if we
-  // refreshed the favicon "too long" ago and should be updated if the page
-  // is visited again.
+  // On |know_favicon| == true, |icon_url_sizes| will be set to a mapping of
+  // all the favicons associated with the requested page to the sizes available
+  // at each icon url.
+  // |know_favicon| will be true, and |icon_url_sizes| will be empty if we know
+  // that the site does not have a favicon.
+  // Each entry in |elements| represents a favicon bitmap at a different pixel
+  // size. If a |pixel_size| parameter was passed in order to get the favicon
+  // data, |elements| will have a single entry with the best match for
+  // |pixel_size|.
+  // |expired| will be set to true if we refreshed the favicon "too long" ago
+  // and should be updated if the page is visited again.
   typedef base::Callback<
       void(Handle,  // handle
            history::FaviconData)>  // the type of favicon
@@ -76,12 +81,6 @@ class FaviconService : public CancelableRequestProvider {
                           CancelableRequestConsumerBase* consumer,
                           const FaviconDataCallback& callback);
 
-  // Requests the favicon for |favicon_id|. The |consumer| is notified when the
-  // bits have been fetched.
-  Handle GetFaviconForID(history::FaviconID favicon_id,
-                         CancelableRequestConsumerBase* consumer,
-                         const FaviconDataCallback& callback);
-
   // Marks all types of favicon for the page as being out of date.
   void SetFaviconOutOfDateForPage(const GURL& page_url);