Eliminate SwapOut message parameters, keeping state in RVHM instead.

content/browser/renderer_host/render_view_host_delegate.h

Index: content/browser/renderer_host/render_view_host_delegate.h
diff --git a/content/browser/renderer_host/render_view_host_delegate.h b/content/browser/renderer_host/render_view_host_delegate.h
index b67eab10e520e72bede3d8756b82ad3e0e5ed2ae..510e6003d68ef2586dac88f9b5ec25cea3ec505b 100644
--- a/content/browser/renderer_host/render_view_host_delegate.h
+++ b/content/browser/renderer_host/render_view_host_delegate.h
@@ -90,12 +90,6 @@ class CONTENT_EXPORT RenderViewHostDelegate {
         bool proceed,
         const base::TimeTicks& proceed_time) = 0;
 
-    // Called by ResourceDispatcherHost when a response for a pending cross-site
-    // request is received.  The ResourceDispatcherHost will pause the response
-    // until the onunload handler of the previous renderer is run.
-    virtual void OnCrossSiteResponse(int new_render_process_host_id,
-                                     int new_request_id) = 0;
-
    protected:
     virtual ~RendererManagement() {}
   };
@@ -189,6 +183,11 @@ class CONTENT_EXPORT RenderViewHostDelegate {
   // The page is trying to close the RenderView's representation in the client.
   virtual void Close(RenderViewHost* render_view_host) {}
 
+  // This pending RenderViewHost is ready to commit a page.  The delegate should
+  // ensure that the old RenderViewHost runs its unload handler.
+  virtual void OnCrossSiteResponse(RenderViewHost* pending_render_view_host,
+                                   const GlobalRequestID& global_request_id) {}
+
   // The RenderViewHost has been swapped out.
   virtual void SwappedOut(RenderViewHost* render_view_host) {}