move favicon download code from chrome/ into content/

chrome/browser/ui/metro_pin_tab_helper_win.h

Index: chrome/browser/ui/metro_pin_tab_helper_win.h
diff --git a/chrome/browser/ui/metro_pin_tab_helper_win.h b/chrome/browser/ui/metro_pin_tab_helper_win.h
index 45b157368da2a98c5ad691fcb2ef7143f2ce972a..63770ce2b585718f3a0c13cc4f380b4274aed709 100644
--- a/chrome/browser/ui/metro_pin_tab_helper_win.h
+++ b/chrome/browser/ui/metro_pin_tab_helper_win.h
@@ -7,19 +7,16 @@
 
 #include <vector>
 
-#include "chrome/browser/favicon/favicon_download_helper.h"
-#include "chrome/browser/favicon/favicon_download_helper_delegate.h"
-#include "chrome/common/favicon_url.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
+#include "content/public/common/favicon_url.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/image/image_skia.h"
 
 // Per-tab class to help manage metro pinning.
 class MetroPinTabHelper
     : public content::WebContentsObserver,
-      public content::WebContentsUserData<MetroPinTabHelper>,
-      public FaviconDownloadHelperDelegate {
+      public content::WebContentsUserData<MetroPinTabHelper> {
  public:
   virtual ~MetroPinTabHelper();
 
@@ -31,6 +28,9 @@ class MetroPinTabHelper
   virtual void DidNavigateMainFrame(
       const content::LoadCommittedDetails& details,
       const content::FrameNavigateParams& params) OVERRIDE;
+  virtual void DidUpdateFaviconURL(
+      int32 page_id,
+      const std::vector<content::FaviconURL>& candidates) OVERRIDE;
 
  private:
   // The FaviconDownloader class handles downloading the favicons when a page
@@ -41,29 +41,24 @@ class MetroPinTabHelper
   explicit MetroPinTabHelper(content::WebContents* tab_contents);
   friend class content::WebContentsUserData<MetroPinTabHelper>;
 
-  // FaviconDownloadHelperDelegate overrides.
-  void OnUpdateFaviconURL(int32 page_id,
-                          const std::vector<FaviconURL>& candidates) OVERRIDE;
-
-  void OnDidDownloadFavicon(int id,
-                            const GURL& image_url,
-                            bool errored,
-                            int requested_size,
-                            const std::vector<SkBitmap>& bitmaps) OVERRIDE;
+  // Favicon download callback.
+  void DidDownloadFavicon(int id,
+                          const GURL& image_url,
+                          bool errored,
+                          int requested_size,
+                          const std::vector<SkBitmap>& bitmaps);
 
   void UnPinPageFromStartScreen();
 
-  // Called by the |favicon_downloader_| when it has finished.
+  // Called by the |favicon_chooser_| when it has finished.
   void FaviconDownloaderFinished();
 
   // Candidate Favicon URLs for the current page.
-  std::vector<FaviconURL> favicon_url_candidates_;
+  std::vector<content::FaviconURL> favicon_url_candidates_;
 
   // The currently active FaviconChooser, if there is one.
   scoped_ptr<FaviconChooser> favicon_chooser_;
 
-  // FaviconDownloadHelper handles the sending and listening for IPC messages.
-  FaviconDownloadHelper favicon_download_helper_;
 
   DISALLOW_COPY_AND_ASSIGN(MetroPinTabHelper);
 };