Use hi-resolution favicon variants if available.

chrome/renderer/chrome_render_view_observer.h

Index: chrome/renderer/chrome_render_view_observer.h
diff --git a/chrome/renderer/chrome_render_view_observer.h b/chrome/renderer/chrome_render_view_observer.h
index 8691ad21d32027473180c70b33e95bbeadc877e6..7d86ea6bcba0146206f997a73362cac8658c7267 100644
--- a/chrome/renderer/chrome_render_view_observer.h
+++ b/chrome/renderer/chrome_render_view_observer.h
@@ -35,7 +35,7 @@ class PhishingClassifierDelegate;
 }
 
 namespace webkit_glue {
-class ImageResourceFetcher;
+class MultiResolutionImageResourceFetcher;
 }
 
 // This class holds the Chrome specific parts of RenderView, and has the same
@@ -167,8 +167,10 @@ class ChromeRenderViewObserver : public content::RenderViewObserver,
   // This callback is triggered when DownloadFavicon completes, either
   // succesfully or with a failure. See DownloadFavicon for more
   // details.
-  void DidDownloadFavicon(webkit_glue::ImageResourceFetcher* fetcher,
-                          const SkBitmap& image);
+  void DidDownloadFavicon(
+      int requested_size,
+      webkit_glue::MultiResolutionImageResourceFetcher* fetcher,
+      const std::vector<SkBitmap>& images);
 
   // Requests to download a favicon image. When done, the RenderView
   // is notified by way of DidDownloadFavicon. Returns true if the
@@ -218,8 +220,9 @@ class ChromeRenderViewObserver : public content::RenderViewObserver,
   // External host exposed through automation controller.
   scoped_ptr<ExternalHostBindings> external_host_bindings_;
 
-  typedef std::vector<linked_ptr<webkit_glue::ImageResourceFetcher> >
-      ImageResourceFetcherList;
+  typedef std::vector<
+      linked_ptr<webkit_glue::MultiResolutionImageResourceFetcher> >
+    ImageResourceFetcherList;
 
   // ImageResourceFetchers schedule via DownloadImage.
   ImageResourceFetcherList image_fetchers_;