Eliminate SwapOut message parameters, keeping state in RVHM instead.

content/browser/renderer_host/render_view_host_delegate.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_DELEGATE_H_
 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_DELEGATE_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 72 matching lines @@
     // AttemptToClosePage.  This is called before a cross-site request or before
     // a tab/window is closed (as indicated by the first parameter) to allow the
     // appropriate renderer to approve or deny the request.  |proceed| indicates
     // whether the user chose to proceed.  |proceed_time| is the time when the
     // request was allowed to proceed.
     virtual void ShouldClosePage(
         bool for_cross_site_transition,
         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() {}
   };
 
   // ---------------------------------------------------------------------------
 
   // Returns the current delegate associated with a feature. May return NULL if
   // there is no corresponding delegate.
   virtual RenderViewHostDelegateView* GetDelegateView();
   virtual RendererManagement* GetRendererManagementDelegate();
@@ skipping 73 matching lines @@
   // The page's encoding was changed and should be updated.
   virtual void UpdateEncoding(RenderViewHost* render_view_host,
                               const std::string& encoding) {}
 
   // The destination URL has changed should be updated
   virtual void UpdateTargetURL(int32 page_id, const GURL& url) {}
 
   // 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) {}
 
   // The page is trying to move the RenderView's representation in the client.
   virtual void RequestMove(const gfx::Rect& new_bounds) {}
 
   // The RenderView began loading a new page. This corresponds to WebKit's
   // notion of the throbber starting.
   virtual void DidStartLoading(RenderViewHost* render_view_host) {}
 
@@ skipping 212 matching lines @@
       const MediaStreamRequest& request,
       const MediaResponseCallback& callback) {}
 
  protected:
   virtual ~RenderViewHostDelegate() {}
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_DELEGATE_H_