PlzNavigate: implement REUSE_COMMITTED_OR_PENDING_SITE for redirects

content/browser/frame_host/navigation_handle_impl.h

 // Copyright 2015 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_FRAME_HOST_NAVIGATION_HANDLE_IMPL_H_
 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATION_HANDLE_IMPL_H_
 
 #include "content/public/browser/navigation_handle.h"
 
 #include <stddef.h>
@@ skipping 266 matching lines @@
   // |callback| will be called when all throttles check have completed. This
   // will allow the caller to cancel the navigation or let it proceed.
   // This will also inform the delegate that the request was redirected.
   void WillRedirectRequest(
       const GURL& new_url,
       const std::string& new_method,
       const GURL& new_referrer_url,
       bool new_is_external_protocol,
       scoped_refptr<net::HttpResponseHeaders> response_headers,
       net::HttpResponseInfo::ConnectionInfo connection_info,
+      RenderProcessHost* new_expected_render_process_host,

[Charlie Reis, 2017/06/27 04:24:53]

Maybe new_expected_process or post_redirect_process (here and below)?

We should also include a comment about this above, and whether it's null in some
cases.

[clamy, 2017/06/27 15:23:05]

Done.

       const ThrottleChecksFinishedCallback& callback);
 
   // Called when the URLRequest has delivered response headers and metadata.
   // |callback| will be called when all throttle checks have completed,
   // allowing the caller to cancel the navigation or let it proceed.
   // NavigationHandle will not call |callback| with a result of DEFER.
   // If the result is PROCEED, then 'ReadyToCommitNavigation' will be called
   // with |render_frame_host| and |response_headers| just before calling
   // |callback|. Should a transfer navigation happen, |transfer_callback| will
   // be run on the IO thread.
@@ skipping 126 matching lines @@
   // Populates |throttles_| with the throttles for this navigation.
   void RegisterNavigationThrottles();
 
   // Checks for attempts to navigate to a page that is already referenced more
   // than once in the frame's ancestors.  This is a helper function used by
   // WillStartRequest and WillRedirectRequest to prevent the navigation.
   bool IsSelfReferentialURL();
 
   // Updates the destination site URL for this navigation. This is called on
   // redirects.
-  // PlzNavigate: When redirected cross-site, the speculative RenderProcessHost
-  // will stop expecting this navigation to commit.
-  void UpdateSiteURL();
+  // PlzNavigate: |new_expected_render_process_host_id| is the id of the
+  // renderer process that should handle the navigation following the redirect
+  // if it can be handled by an existing RenderProcessHost. Otherwise, it should
+  // be ChildProcessHost::kInvalidUniqueID.

[Charlie Reis, 2017/06/27 04:24:53]

This comment is talking about IDs, but we pass a RenderProcessHost* below.

[clamy, 2017/06/27 15:23:05]

Done.

+  void UpdateSiteURL(RenderProcessHost* new_expected_render_process_host);
 
   // See NavigationHandle for a description of those member variables.
   GURL url_;
   scoped_refptr<SiteInstance> starting_site_instance_;
   Referrer sanitized_referrer_;
   bool has_user_gesture_;
   ui::PageTransition transition_;
   bool is_external_protocol_;
   net::Error net_error_code_;
   RenderFrameHostImpl* render_frame_host_;
@@ skipping 135 matching lines @@
   int expected_render_process_host_id_;
 
   base::WeakPtrFactory<NavigationHandleImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(NavigationHandleImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_NAVIGATION_HANDLE_IMPL_H_