Split FaviconHelper in two: ImageLoadingHelper and FaviconHelper

content/renderer/render_view_impl.h

Index: content/renderer/render_view_impl.h
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
index 28a6f1a3f707c662e5bd033c426c81110bb09660..44730256ced6079357a263f636a8e70a235b52b6 100644
--- a/content/renderer/render_view_impl.h
+++ b/content/renderer/render_view_impl.h
@@ -169,6 +169,7 @@ class RenderWidgetFullscreenPepper;
 class SpeechRecognitionDispatcher;
 class WebPluginDelegateProxy;
 struct CustomContextMenuContext;
+struct FaviconURL;
 struct FileChooserParams;
 struct RenderViewImplParams;
 
@@ -1186,6 +1187,13 @@ class CONTENT_EXPORT RenderViewImpl
   // If |url| is empty, show |fallback_url|.
   void UpdateTargetURL(const GURL& url, const GURL& fallback_url);
 
+  // Tells the browser what the new list of favicons for the webpage is.
+  void SendUpdateFaviconURL(const std::vector<FaviconURL>& urls);
+
+  // Invoked from DidStopLoading(). Sends the current list of loaded favicons to
+  // the browser.
+  void DidStopLoadingIcons();
+
   // Coordinate conversion -----------------------------------------------------
 
   gfx::RectF ClientRectToPhysicalWindowRect(const gfx::RectF& rect) const;
@@ -1418,9 +1426,6 @@ class CONTENT_EXPORT RenderViewImpl
   // Mouse Lock dispatcher attached to this view.
   MouseLockDispatcher* mouse_lock_dispatcher_;
 
-  // Helper class to handle favicon changes.
-  FaviconHelper* favicon_helper_;
-
 #if defined(OS_ANDROID)
   // Android Specific ---------------------------------------------------------