Extract Favicon Download logic from FaviconTabHelper

chrome/browser/favicon/favicon_tab_helper.cc

Index: chrome/browser/favicon/favicon_tab_helper.cc
diff --git a/chrome/browser/favicon/favicon_tab_helper.cc b/chrome/browser/favicon/favicon_tab_helper.cc
index 6525b0664ab790bab6e94c762c9dfe502ccdd61c..b0d887d9341108514501881adfd2d6107aba785e 100644
--- a/chrome/browser/favicon/favicon_tab_helper.cc
+++ b/chrome/browser/favicon/favicon_tab_helper.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 
+#include "chrome/browser/favicon/favicon_download_helper.h"
 #include "chrome/browser/favicon/favicon_handler.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/favicon/favicon_util.h"
@@ -145,9 +146,9 @@ NavigationEntry* FaviconTabHelper::GetActiveEntry() {
 }
 
 int FaviconTabHelper::StartDownload(const GURL& url, int image_size) {
-  content::RenderViewHost* host = web_contents()->GetRenderViewHost();
-  int id = FaviconUtil::DownloadFavicon(host, url, image_size);
-  return id;
+  FaviconDownloadHelper* helper =
+      FaviconDownloadHelper::FromWebContents(web_contents());

[joth, 2012/10/30 14:17:46]

I think it maybe clearer to either DCHECK the result rather than try and deal
with a possible NULL here. or else call
CreateForWebContentsAndDelegate(web_contents(), this) which ensures it will
never be NULL.

[Cait (Slow), 2012/10/30 18:05:55]

Done.

+  return helper ? helper->DownloadFavicon(url, image_size) : -1;
 }
 
 void FaviconTabHelper::NotifyFaviconUpdated() {
@@ -177,16 +178,6 @@ void FaviconTabHelper::DidNavigateMainFrame(
   FetchFavicon(details.entry->GetURL());
 }
 
-bool FaviconTabHelper::OnMessageReceived(const IPC::Message& message) {
-  bool message_handled = false;   // Allow other handlers to receive these.
-  IPC_BEGIN_MESSAGE_MAP(FaviconTabHelper, message)
-    IPC_MESSAGE_HANDLER(IconHostMsg_DidDownloadFavicon, OnDidDownloadFavicon)
-    IPC_MESSAGE_HANDLER(IconHostMsg_UpdateFaviconURL, OnUpdateFaviconURL)
-    IPC_MESSAGE_UNHANDLED(message_handled = false)
-  IPC_END_MESSAGE_MAP()
-  return message_handled;
-}
-
 void FaviconTabHelper::OnDidDownloadFavicon(
     int id,
     const GURL& image_url,