Move TransferNavigationResourceThrottle into CrossSiteResourceHandler.

content/browser/web_contents/render_view_host_manager.h

Index: content/browser/web_contents/render_view_host_manager.h
diff --git a/content/browser/web_contents/render_view_host_manager.h b/content/browser/web_contents/render_view_host_manager.h
index d653a742f286b4ff5c0b849a1ad469f9f5490446..82dbb93ebfa1b7f854a421d535ee6d2f8dce28b9 100644
--- a/content/browser/web_contents/render_view_host_manager.h
+++ b/content/browser/web_contents/render_view_host_manager.h
@@ -14,6 +14,7 @@
 #include "content/common/content_export.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
+#include "content/public/common/referrer.h"
 
 
 namespace content {
@@ -212,6 +213,9 @@ class CONTENT_EXPORT RenderViewHostManager
       const base::TimeTicks& proceed_time) OVERRIDE;
   virtual void OnCrossSiteResponse(
       RenderViewHost* pending_render_view_host,
+      const GURL& pending_url,
+      const Referrer& referrer,
+      int64 frame_id,
       const GlobalRequestID& global_request_id) OVERRIDE;
 
   // NotificationObserver implementation.
@@ -230,7 +234,8 @@ class CONTENT_EXPORT RenderViewHostManager
   RenderViewHostImpl* GetSwappedOutRenderViewHost(SiteInstance* instance);
 
   // Runs the unload handler in the current page, when we know that a pending
-  // cross-process navigation is going to commit.
+  // cross-process navigation is going to commit.  We may initiate a transfer
+  // to a new process after this completes or times out.
   void SwapOutOldPage();
 
  private:
@@ -238,12 +243,17 @@ class CONTENT_EXPORT RenderViewHostManager
   friend class TestWebContents;
 
   // Tracks information about a navigation while a cross-process transition is
-  // in progress.
-  // TODO(creis): Add transfer navigation params for http://crbug.com/238331.
+  // in progress, in case we need to transfer it to a new RenderViewHost.
   struct PendingNavigationParams {
     PendingNavigationParams();
-    explicit PendingNavigationParams(const GlobalRequestID& global_request_id);
-
+    PendingNavigationParams(const GURL& new_url,
+                            Referrer referrer,
+                            int64 frame_id,
+                            const GlobalRequestID& global_request_id);
+
+    GURL new_url;

[Matt Perry, 2013/06/18 22:58:51]

Could you document these fields? Also, it looks like new_url is only used for
redirect transfers. Maybe redirect_url would be a better name? Alternatively, it
might be clearer to add a boolean as to whether this refers to a redirect
transfer, rather than having a non-empty new_url imply it.

[Charlie Reis, 2013/06/19 00:17:01]

Good call.  I went with transfer_url (since we'll be using this for more than
redirects in the future) and added a is_transfer boolean.

I also reordered the arguments here and on OnCrossSiteResponse to better reflect
which ones are gated by is_transfer.

+    Referrer referrer;
+    int64 frame_id;
     GlobalRequestID global_request_id;
   };