move favicon download code from chrome/ into content/

chrome/browser/prerender/prerender_contents.h

Index: chrome/browser/prerender/prerender_contents.h
diff --git a/chrome/browser/prerender/prerender_contents.h b/chrome/browser/prerender/prerender_contents.h
index 4a46b49037a69bb3ca4f7f445b02dc898c41a748..3a085ba0269db2add2075ad1a59f67935d899103 100644
--- a/chrome/browser/prerender/prerender_contents.h
+++ b/chrome/browser/prerender/prerender_contents.h
@@ -15,6 +15,7 @@
 #include "base/values.h"
 #include "chrome/browser/prerender/prerender_final_status.h"
 #include "chrome/browser/prerender/prerender_origin.h"
+#include "content/public/browser/favicon_download_delegate.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents_observer.h"
@@ -23,13 +24,14 @@
 
 class Profile;
 class TabContents;
-struct FaviconURL;
+
 
 namespace base {
 class ProcessMetrics;
 }
 
 namespace content {
+struct FaviconURL;
 class RenderViewHost;
 class SessionStorageNamespace;
 class WebContents;
@@ -47,7 +49,8 @@ class PrerenderRenderViewHostObserver;
 class PrerenderTracker;
 
 class PrerenderContents : public content::NotificationObserver,
-                          public content::WebContentsObserver {
+                          public content::WebContentsObserver,
+                          public content::FaviconDownloadDelegate {
  public:
   // PrerenderContents::Create uses the currently registered Factory to create
   // the PrerenderContents. Factory is intended for testing.
@@ -304,8 +307,9 @@ class PrerenderContents : public content::NotificationObserver,
 
   friend class PrerenderRenderViewHostObserver;
 
-  // Message handlers.
-  void OnUpdateFaviconURL(int32 page_id, const std::vector<FaviconURL>& urls);
+  // Update |icon_url_| when a favicon url of page is updated.
+  void UpdateFaviconURL(int32 page_id,
+                        const std::vector<content::FaviconURL>& urls);
 
   // Returns the RenderViewHost Delegate for this prerender.
   content::WebContents* GetWebContents();
@@ -378,6 +382,7 @@ class PrerenderContents : public content::NotificationObserver,
 
   scoped_ptr<TabContentsDelegateImpl> tab_contents_delegate_;
 
+

[jam, 2012/11/27 01:16:31]

nit: undo

[Cait (Slow), 2012/11/28 00:11:45]

Done.

   // These are -1 before a RenderView is created.
   int child_id_;
   int route_id_;