Split FaviconHelper in two: ImageLoadingHelper and FaviconHelper

content/public/browser/web_contents.h

Index: content/public/browser/web_contents.h
diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
index dfbe07329ce4fe751912def4a4bcc6b6ae28e356..d9665c67c38d6bf4560ee642845ddc56536aa813 100644
--- a/content/public/browser/web_contents.h
+++ b/content/public/browser/web_contents.h
@@ -418,7 +418,7 @@ class WebContents : public PageNavigator,
                               const GURL&, /* image_url */
                               int,  /* requested_size */
                               const std::vector<SkBitmap>& /* bitmaps*/)>
-      FaviconDownloadCallback;
+      ImageDownloadCallback;
 
   // Sends a request to download the given favicon |url| and returns the unique

[jam, 2013/03/19 20:12:21]

nit: update comment

[Dmitry Titov, 2013/03/20 01:30:22]

Done.

   // id of the download request. When the download is finished, |callback| will
@@ -426,8 +426,8 @@ class WebContents : public PageNavigator,
   // |image_size| is a hint for images with multiple sizes. The downloaded image
   // is not resized to the given image_size. If 0 is passed, the first frame of
   // the image is returned.
-  virtual int DownloadFavicon(const GURL& url, int image_size,
-                              const FaviconDownloadCallback& callback) = 0;
+  virtual int DownloadImage(const GURL& url, int image_size,
+                            const ImageDownloadCallback& callback) = 0;
 
  private:
   // This interface should only be implemented inside content.