Move TransferNavigationResourceThrottle into CrossSiteResourceHandler.

content/browser/web_contents/render_view_host_manager.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_WEB_CONTENTS_RENDER_VIEW_HOST_MANAGER_H_
 #define CONTENT_BROWSER_WEB_CONTENTS_RENDER_VIEW_HOST_MANAGER_H_
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "content/browser/renderer_host/render_view_host_delegate.h"
 #include "content/browser/site_instance_impl.h"
 #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 {
 class BrowserContext;
 class InterstitialPageImpl;
 class NavigationControllerImpl;
 class NavigationEntry;
 class NavigationEntryImpl;
 class RenderViewHost;
 class RenderViewHostImpl;
@@ skipping 178 matching lines @@
   // showing.
   InterstitialPageImpl* interstitial_page() const { return interstitial_page_; }
 
   // RenderViewHostDelegate::RendererManagement implementation.
   virtual void ShouldClosePage(
       bool for_cross_site_transition,
       bool proceed,
       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.
   virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details) OVERRIDE;
 
   // Called when a RenderViewHost is about to be deleted.
   void RenderViewDeleted(RenderViewHost* rvh);
 
   // Returns whether the given RenderViewHost is on the list of swapped out
   // RenderViewHosts.
   bool IsOnSwappedOutList(RenderViewHost* rvh) const;
 
   // Returns the swapped out RenderViewHost for the given SiteInstance, if any.
   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:
   friend class RenderViewHostManagerTest;
   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;
   };
 
   // Returns whether this tab should transition to a new renderer for
   // cross-site URLs.  Enabled unless we see the --process-per-tab command line
   // switch.  Can be overridden in unit tests.
   bool ShouldTransitionCrossSite();
 
   // Returns true if the two navigation entries are incompatible in some way
   // other than site instances. Cases where this can happen include Web UI
@@ skipping 85 matching lines @@
   InterstitialPageImpl* interstitial_page_;
 
   NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderViewHostManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_WEB_CONTENTS_RENDER_VIEW_HOST_MANAGER_H_