move favicon download code from chrome/ into content/

content/browser/web_contents/web_contents_impl.h

Index: content/browser/web_contents/web_contents_impl.h
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index 8857a033c9dc0123f57a026af1281336ed5fbbbd..fe582031378f280e481ba74f24621013a7ec9eac 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -62,6 +62,7 @@ class WebContentsImpl;
 class WebContentsObserver;
 class WebContentsView;
 class WebContentsViewDelegate;
+struct FaviconURL;
 struct LoadNotificationDetails;
 
 // Factory function for the implementations that content knows about. Takes
@@ -277,6 +278,8 @@ class CONTENT_EXPORT WebContentsImpl
   virtual void DidChooseColorInColorChooser(int color_chooser_id,
                                             SkColor color) OVERRIDE;
   virtual void DidEndColorChooser(int color_chooser_id) OVERRIDE;
+  virtual int DownloadFavicon(const GURL& url, int image_size,
+                              const FaviconDownloadCallback& callback) OVERRIDE;
 
   // Implementation of PageNavigator.
   virtual WebContents* OpenURL(const OpenURLParams& params) OVERRIDE;
@@ -570,6 +573,13 @@ class CONTENT_EXPORT WebContentsImpl
   void OnBrowserPluginCreateGuest(
       int instance_id,
       const BrowserPluginHostMsg_CreateGuest_Params& params);
+  void OnDidDownloadFavicon(int id,
+                            const GURL& image_url,
+                            bool errored,
+                            int requested_size,
+                            const std::vector<SkBitmap>& bitmaps);
+  void OnUpdateFaviconURL(int32 page_id,
+                          const std::vector<FaviconURL>& candidates);
 
   // Changes the IsLoading state and notifies delegate as needed
   // |details| is used to provide details on the load that just finished
@@ -857,6 +867,10 @@ class CONTENT_EXPORT WebContentsImpl
   // outlive it.
   std::set<RenderWidgetHostImpl*> created_widgets_;
 
+  // Maps the ids of pending favicon downloads to their callbacks
+  typedef std::map<int, FaviconDownloadCallback> FaviconDownloadMap;
+  FaviconDownloadMap favicon_download_map_;
+
   DISALLOW_COPY_AND_ASSIGN(WebContentsImpl);
 };