Merge CrossSiteResourceHandler and NavigationResourceThrottle

content/browser/loader/navigation_resource_throttle.cc

Index: content/browser/loader/navigation_resource_throttle.cc
diff --git a/content/browser/loader/navigation_resource_throttle.cc b/content/browser/loader/navigation_resource_throttle.cc
index bf23c43b14f9f42bb06925360f29e21952d97255..776fdc1248dffaa48e5428c94cf3218ac7d334f3 100644
--- a/content/browser/loader/navigation_resource_throttle.cc
+++ b/content/browser/loader/navigation_resource_throttle.cc
@@ -13,6 +13,7 @@
 #include "base/memory/ref_counted.h"
 #include "content/browser/frame_host/navigation_handle_impl.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
+#include "content/browser/loader/resource_dispatcher_host_impl.h"
 #include "content/browser/loader/resource_loader.h"
 #include "content/browser/loader/resource_request_info_impl.h"
 #include "content/public/browser/browser_thread.h"
@@ -32,6 +33,12 @@
 namespace content {
 
 namespace {
+
+// Used in unit tests to make UI checks succeed even if there is no
+// NavigationHandle and to transfer all navigations.
+bool g_ui_checks_always_succeed = false;
+bool g_force_transfer = false;
+
 typedef base::Callback<void(NavigationThrottle::ThrottleCheckResult)>
     UIChecksPerformedCallback;
 
@@ -58,15 +65,20 @@ void CheckWillStartRequestOnUIThread(
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   RenderFrameHostImpl* render_frame_host =
       RenderFrameHostImpl::FromID(render_process_id, render_frame_host_id);
-  if (!render_frame_host) {
+  if (g_ui_checks_always_succeed) {
     SendCheckResultToIOThread(callback, NavigationThrottle::PROCEED);
     return;
   }
 
+  if (!render_frame_host) {
+    SendCheckResultToIOThread(callback, NavigationThrottle::CANCEL);
+    return;
+  }
+
   NavigationHandleImpl* navigation_handle =
       render_frame_host->navigation_handle();
   if (!navigation_handle) {
-    SendCheckResultToIOThread(callback, NavigationThrottle::PROCEED);
+    SendCheckResultToIOThread(callback, NavigationThrottle::CANCEL);
     return;
   }
 
@@ -88,15 +100,20 @@ void CheckWillRedirectRequestOnUIThread(
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   RenderFrameHostImpl* render_frame_host =
       RenderFrameHostImpl::FromID(render_process_id, render_frame_host_id);
-  if (!render_frame_host) {
+  if (g_ui_checks_always_succeed) {
     SendCheckResultToIOThread(callback, NavigationThrottle::PROCEED);
     return;
   }
 
+  if (!render_frame_host) {
+    SendCheckResultToIOThread(callback, NavigationThrottle::CANCEL);
+    return;
+  }
+
   NavigationHandleImpl* navigation_handle =
       render_frame_host->navigation_handle();
   if (!navigation_handle) {
-    SendCheckResultToIOThread(callback, NavigationThrottle::PROCEED);
+    SendCheckResultToIOThread(callback, NavigationThrottle::CANCEL);
     return;
   }
 
@@ -114,19 +131,33 @@ void WillProcessResponseOnUIThread(
     int render_frame_host_id,
     scoped_refptr<net::HttpResponseHeaders> headers,
     const SSLStatus& ssl_status,
+    const GlobalRequestID& request_id,
+    bool should_replace_current_entry,
+    bool is_download,
+    bool is_stream,
+    const base::Closure& transfer_callback,
     std::unique_ptr<NavigationData> navigation_data) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   RenderFrameHostImpl* render_frame_host =
       RenderFrameHostImpl::FromID(render_process_id, render_frame_host_id);
-  if (!render_frame_host) {
+  if (g_force_transfer) {
+    BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, transfer_callback);
+  }
+
+  if (g_ui_checks_always_succeed) {
     SendCheckResultToIOThread(callback, NavigationThrottle::PROCEED);
     return;
   }
 
+  if (!render_frame_host) {
+    SendCheckResultToIOThread(callback, NavigationThrottle::CANCEL);
+    return;
+  }
+
   NavigationHandleImpl* navigation_handle =
       render_frame_host->navigation_handle();
   if (!navigation_handle) {
-    SendCheckResultToIOThread(callback, NavigationThrottle::PROCEED);
+    SendCheckResultToIOThread(callback, NavigationThrottle::CANCEL);
     return;
   }
 
@@ -134,7 +165,8 @@ void WillProcessResponseOnUIThread(
     navigation_handle->set_navigation_data(std::move(navigation_data));
 
   navigation_handle->WillProcessResponse(
-      render_frame_host, headers, ssl_status,
+      render_frame_host, headers, ssl_status, request_id,
+      should_replace_current_entry, is_download, is_stream, transfer_callback,
       base::Bind(&SendCheckResultToIOThread, callback));
 }
 
@@ -149,6 +181,8 @@ NavigationResourceThrottle::NavigationResourceThrottle(
       resource_dispatcher_host_delegate_(resource_dispatcher_host_delegate),
       cert_store_(cert_store),
       request_context_type_(request_context_type),
+      in_cross_site_transition_(false),
+      on_transfer_done_result_(NavigationThrottle::CANCEL),
       weak_ptr_factory_(this) {}
 
 NavigationResourceThrottle::~NavigationResourceThrottle() {}
@@ -227,7 +261,8 @@ void NavigationResourceThrottle::WillRedirectRequest(
 
 void NavigationResourceThrottle::WillProcessResponse(bool* defer) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request_);
+  const ResourceRequestInfoImpl* info =
+      ResourceRequestInfoImpl::ForRequest(request_);
   if (!info)
     return;
 
@@ -257,6 +292,9 @@ void NavigationResourceThrottle::WillProcessResponse(bool* defer) {
   UIChecksPerformedCallback callback =
       base::Bind(&NavigationResourceThrottle::OnUIChecksPerformed,
                  weak_ptr_factory_.GetWeakPtr());
+  base::Closure transfer_callback =
+      base::Bind(&NavigationResourceThrottle::InitiateTransfer,
+                 weak_ptr_factory_.GetWeakPtr());
 
   SSLStatus ssl_status;
   if (request_->ssl_info().cert.get()) {
@@ -269,6 +307,9 @@ void NavigationResourceThrottle::WillProcessResponse(bool* defer) {
       BrowserThread::UI, FROM_HERE,
       base::Bind(&WillProcessResponseOnUIThread, callback, render_process_id,
                  render_frame_id, response_headers, ssl_status,
+                 info->GetGlobalRequestID(),
+                 info->should_replace_current_entry(), info->IsDownload(),
+                 info->is_stream(), transfer_callback,
                  base::Passed(&cloned_data)));
   *defer = true;
 }
@@ -277,9 +318,24 @@ const char* NavigationResourceThrottle::GetNameForLogging() const {
   return "NavigationResourceThrottle";
 }
 
+void NavigationResourceThrottle::SetUIChecksAlwaysSuccedForTesting(
+    bool ui_checks_always_succeed) {
+  g_ui_checks_always_succeed = ui_checks_always_succeed;
+}
+
+void NavigationResourceThrottle::SetForceTransferForTesting(
+    bool force_transfer) {
+  g_force_transfer = force_transfer;
+}
+
 void NavigationResourceThrottle::OnUIChecksPerformed(
     NavigationThrottle::ThrottleCheckResult result) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  if (in_cross_site_transition_) {
+    on_transfer_done_result_ = result;
+    return;
+  }
+
   if (result == NavigationThrottle::CANCEL_AND_IGNORE) {
     controller()->CancelAndIgnore();
   } else if (result == NavigationThrottle::CANCEL) {
@@ -291,4 +347,20 @@ void NavigationResourceThrottle::OnUIChecksPerformed(
   }
 }
 
+void NavigationResourceThrottle::InitiateTransfer() {

[nasko, 2016/09/08 23:45:39]

Can we put a DCHECK_CURRENTLY_ON to make it easier to understand which thread
this method is supposed to be called on?

[clamy, 2016/09/09 15:06:41]

Done.

+  in_cross_site_transition_ = true;
+  ResourceRequestInfoImpl* info =
+      ResourceRequestInfoImpl::ForRequest(request_);
+  ResourceDispatcherHostImpl::Get()->MarkAsTransferredNavigation(
+      info->GetGlobalRequestID(),
+      base::Bind(&NavigationResourceThrottle::OnTransferDone,
+                 weak_ptr_factory_.GetWeakPtr()));
+}
+
+void NavigationResourceThrottle::OnTransferDone() {

[nasko, 2016/09/08 23:45:39]

Same here, add DCHECK_CURRENTLY_ON.

[clamy, 2016/09/09 15:06:41]

Done.

+  DCHECK(in_cross_site_transition_);
+  in_cross_site_transition_ = false;
+  OnUIChecksPerformed(on_transfer_done_result_);
+}
+
 }  // namespace content