Use hi-resolution favicon variants if available.

chrome/browser/favicon/favicon_tab_helper.h

Index: chrome/browser/favicon/favicon_tab_helper.h
diff --git a/chrome/browser/favicon/favicon_tab_helper.h b/chrome/browser/favicon/favicon_tab_helper.h
index caa54170a8788709d04374f45c2e1e5e21a0616d..3d6be79792056bc86aca3769c191abb4e72a13b8 100644
--- a/chrome/browser/favicon/favicon_tab_helper.h
+++ b/chrome/browser/favicon/favicon_tab_helper.h
@@ -15,6 +15,10 @@
 #include "content/public/browser/web_contents_observer.h"
 #include "googleurl/src/gurl.h"
 
+namespace gfx {
+class Image;
+}
+
 class FaviconHandler;
 class SkBitmap;
 
@@ -42,6 +46,8 @@ class FaviconTabHelper : public content::WebContentsObserver,
   // entries, which should rarely happen.
   SkBitmap GetFavicon() const;
 
+  gfx::Image GetFaviconImage() const;
+
   // Returns true if we have the favicon for the page.
   bool FaviconIsValid() const;
 
@@ -73,7 +79,7 @@ class FaviconTabHelper : public content::WebContentsObserver,
 
   // FaviconHandlerDelegate methods.
   virtual content::NavigationEntry* GetActiveEntry() OVERRIDE;
-  virtual int StartDownload(const GURL& url, int image_size) OVERRIDE;
+  virtual int StartDownload(const GURL& url, const std::vector<int>& image_size) OVERRIDE;
   virtual void NotifyFaviconUpdated() OVERRIDE;
 
  private:
@@ -89,7 +95,7 @@ class FaviconTabHelper : public content::WebContentsObserver,
   void OnDidDownloadFavicon(int id,
                             const GURL& image_url,
                             bool errored,
-                            const SkBitmap& image);
+                            const std::vector<SkBitmap>& image);
 
   Profile* profile_;