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 1842a7e01ab828b09a073529cf8b9d83d48398e0..43339b9a64d74fa9eaad22103310c410d7df8969 100644
--- a/content/renderer/render_view_impl.h
+++ b/content/renderer/render_view_impl.h
@@ -170,6 +170,7 @@ class SpeechRecognitionDispatcher;
 class WebPluginDelegateProxy;
 struct CustomContextMenuContext;
 struct FileChooserParams;
+struct FaviconURL;

[jam, 2013/03/21 01:14:51]

nit: order

[Dmitry Titov, 2013/03/27 22:41:13]

Done.

 struct RenderViewImplParams;
 
 #if defined(OS_ANDROID)
@@ -1201,6 +1202,9 @@ class CONTENT_EXPORT RenderViewImpl
   // If |url| is empty, show |fallback_url|.
   void UpdateTargetURL(const GURL& url, const GURL& fallback_url);
 
+  void SendUpdateFaviconURL(const std::vector<FaviconURL>& urls);
+  void DidStopLoadingIcons();
+
   // Coordinate conversion -----------------------------------------------------
 
   gfx::RectF ClientRectToPhysicalWindowRect(const gfx::RectF& rect) const;
@@ -1440,9 +1444,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 ---------------------------------------------------------