Extract renderer-side favicon downloading code into separate helper class

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 b7fae44afd50877d4401165fe0df862e3edc4354..15b0c37df5866e1cc04b0d9aef773861e16513f7 100644
--- a/chrome/renderer/chrome_render_view_observer.h
+++ b/chrome/renderer/chrome_render_view_observer.h
@@ -20,6 +20,7 @@
 class ChromeRenderProcessObserver;
 class ContentSettingsObserver;
 class ExternalHostBindings;
+class FaviconHelper;
 class SkBitmap;
 class TranslateHelper;
 class WebViewColorOverlay;
@@ -38,10 +39,6 @@ namespace safe_browsing {
 class PhishingClassifierDelegate;
 }
 
-namespace webkit_glue {
-class MultiResolutionImageResourceFetcher;
-}
-
 // This class holds the Chrome specific parts of RenderView, and has the same
 // lifetime.
 class ChromeRenderViewObserver : public content::RenderViewObserver,
@@ -53,7 +50,8 @@ class ChromeRenderViewObserver : public content::RenderViewObserver,
       ContentSettingsObserver* content_settings,
       ChromeRenderProcessObserver* chrome_render_process_observer,
       extensions::Dispatcher* extension_dispatcher,
-      TranslateHelper* translate_helper);
+      TranslateHelper* translate_helper,
+      FaviconHelper* favicon_helper);
   virtual ~ChromeRenderViewObserver();
 
  private:
@@ -136,7 +134,6 @@ class ChromeRenderViewObserver : public content::RenderViewObserver,
                                        const std::string& origin,
                                        const std::string& target);
   void OnJavaScriptStressTestControl(int cmd, int param);
-  void OnDownloadFavicon(int id, const GURL& image_url, int image_size);
   void OnSetIsPrerendering(bool is_prerendering);
   void OnSetAllowDisplayingInsecureContent(bool allow);
   void OnSetAllowRunningInsecureContent(bool allow);
@@ -162,26 +159,6 @@ class ChromeRenderViewObserver : public content::RenderViewObserver,
 
   ExternalHostBindings* GetExternalHostBindings();
 
-  // This callback is triggered when DownloadFavicon completes, either
-  // succesfully or with a failure. See DownloadFavicon for more
-  // details.
-  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
-  // request was successfully started, false otherwise. id is used to
-  // uniquely identify the request and passed back to the
-  // DidDownloadFavicon method. If the image has multiple frames, the
-  // frame whose size is image_size is returned. If the image doesn't
-  // have a frame at the specified size, the first is returned.
-  bool DownloadFavicon(int id, const GURL& image_url, int image_size);
-
-  // Decodes a data: URL image or returns an empty image in case of failure.
-  SkBitmap ImageFromDataUrl(const GURL&) const;
-
   // Determines if a host is in the strict security host set.
   bool IsStrictSecurityHost(const std::string& host);
 
@@ -201,6 +178,7 @@ class ChromeRenderViewObserver : public content::RenderViewObserver,
   ContentSettingsObserver* content_settings_;
   TranslateHelper* translate_helper_;
   safe_browsing::PhishingClassifierDelegate* phishing_classifier_;
+  FaviconHelper* favicon_helper_;
 
   // Page_id from the last page we indexed. This prevents us from indexing the
   // same page twice in a row.
@@ -218,13 +196,6 @@ class ChromeRenderViewObserver : public content::RenderViewObserver,
   // External host exposed through automation controller.
   scoped_ptr<ExternalHostBindings> external_host_bindings_;
 
-  typedef std::vector<
-      linked_ptr<webkit_glue::MultiResolutionImageResourceFetcher> >
-    ImageResourceFetcherList;
-
-  // ImageResourceFetchers schedule via DownloadImage.
-  ImageResourceFetcherList image_fetchers_;
-
   // A color page overlay when visually de-emaphasized.
   scoped_ptr<WebViewColorOverlay> dimmed_color_overlay_;