Extract Favicon Download logic from FaviconTabHelper

chrome/browser/favicon/favicon_tab_helper.h

Index: chrome/browser/favicon/favicon_tab_helper.h
diff --git a/chrome/browser/favicon/favicon_tab_helper.h b/chrome/browser/favicon/favicon_tab_helper.h
index d8e0750a5fb10523df8ed28fd95f41c82605e5ac..15fc9f6d623839d091327f8eebe5e581d9b3e5c4 100644
--- a/chrome/browser/favicon/favicon_tab_helper.h
+++ b/chrome/browser/favicon/favicon_tab_helper.h
@@ -9,6 +9,7 @@
 
 #include "base/basictypes.h"
 #include "base/callback.h"
+#include "chrome/browser/favicon/favicon_download_delegate.h"
 #include "chrome/browser/favicon/favicon_handler_delegate.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/common/favicon_url.h"
@@ -35,6 +36,7 @@ class SkBitmap;
 //
 class FaviconTabHelper : public content::WebContentsObserver,
                          public FaviconHandlerDelegate,
+                         public FaviconDownloadDelegate,
                          public content::WebContentsUserData<FaviconTabHelper> {
  public:
   virtual ~FaviconTabHelper();
@@ -95,12 +97,12 @@ class FaviconTabHelper : public content::WebContentsObserver,
       const content::FrameNavigateParams& params) OVERRIDE;
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
-  // Message handler for IconHostMsg_DidDownloadFavicon.
-  void OnDidDownloadFavicon(int id,
+  // FaviconDownloadDelegate overrides.
+  virtual void OnDidDownloadFavicon(int id,
                             const GURL& image_url,

[Jói, 2012/10/16 21:56:52]

indentation

[Cait (Slow), 2012/10/17 16:00:42]

Done.

                             bool errored,
                             int requested_size,
-                            const std::vector<SkBitmap>& bitmaps);
+                            const std::vector<SkBitmap>& bitmaps) OVERRIDE;
 
   Profile* profile_;