Revert the merge of 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 e9c8e269d89405ca9380261f521ff1c5ebf18797..a9edcacdb9dc339e439fc0117c9dad52426a0fce 100644
--- a/content/browser/loader/navigation_resource_throttle.cc
+++ b/content/browser/loader/navigation_resource_throttle.cc
@@ -15,8 +15,6 @@
 #include "content/browser/frame_host/navigator.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/browser/loader/navigation_resource_handler.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"
 #include "content/public/browser/navigation_data.h"
@@ -40,9 +38,6 @@ namespace {
 // NavigationHandle.
 bool g_ui_checks_always_succeed = false;
 
-// Used in unit tests to transfer all navigations.
-bool g_force_transfer = false;
-
 typedef base::Callback<void(NavigationThrottle::ThrottleCheckResult)>
     UIChecksPerformedCallback;
 
@@ -144,18 +139,8 @@ 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);
-
-  if (g_force_transfer) {
-    BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, transfer_callback);
-  }
-
   NavigationHandleImpl* navigation_handle =
       FindNavigationHandle(render_process_id, render_frame_host_id, callback);
   if (!navigation_handle)
@@ -168,8 +153,7 @@ void WillProcessResponseOnUIThread(
       RenderFrameHostImpl::FromID(render_process_id, render_frame_host_id);
   DCHECK(render_frame_host);
   navigation_handle->WillProcessResponse(
-      render_frame_host, headers, ssl_status, request_id,
-      should_replace_current_entry, is_download, is_stream, transfer_callback,
+      render_frame_host, headers, ssl_status,
       base::Bind(&SendCheckResultToIOThread, callback));
 }
 
@@ -182,8 +166,6 @@ NavigationResourceThrottle::NavigationResourceThrottle(
     : request_(request),
       resource_dispatcher_host_delegate_(resource_dispatcher_host_delegate),
       request_context_type_(request_context_type),
-      in_cross_site_transition_(false),
-      on_transfer_done_result_(NavigationThrottle::DEFER),
       weak_ptr_factory_(this) {}
 
 NavigationResourceThrottle::~NavigationResourceThrottle() {}
@@ -262,8 +244,7 @@ void NavigationResourceThrottle::WillRedirectRequest(
 
 void NavigationResourceThrottle::WillProcessResponse(bool* defer) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  const ResourceRequestInfoImpl* info =
-      ResourceRequestInfoImpl::ForRequest(request_);
+  const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request_);
   if (!info)
     return;
 
@@ -293,9 +274,6 @@ 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()) {
@@ -307,9 +285,6 @@ 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;
 }
@@ -323,20 +298,9 @@ void NavigationResourceThrottle::set_ui_checks_always_succeed_for_testing(
   g_ui_checks_always_succeed = ui_checks_always_succeed;
 }
 
-void NavigationResourceThrottle::set_force_transfer_for_testing(
-    bool force_transfer) {
-  g_force_transfer = force_transfer;
-}
-
 void NavigationResourceThrottle::OnUIChecksPerformed(
     NavigationThrottle::ThrottleCheckResult result) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  DCHECK_NE(NavigationThrottle::DEFER, result);
-  if (in_cross_site_transition_) {
-    on_transfer_done_result_ = result;
-    return;
-  }
-
   if (result == NavigationThrottle::CANCEL_AND_IGNORE) {
     controller()->CancelAndIgnore();
   } else if (result == NavigationThrottle::CANCEL) {
@@ -348,28 +312,4 @@ void NavigationResourceThrottle::OnUIChecksPerformed(
   }
 }
 
-void NavigationResourceThrottle::InitiateTransfer() {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  in_cross_site_transition_ = true;
-  ResourceRequestInfoImpl* info =
-      ResourceRequestInfoImpl::ForRequest(request_);
-  ResourceDispatcherHostImpl::Get()->MarkAsTransferredNavigation(
-      info->GetGlobalRequestID(),
-      base::Bind(&NavigationResourceThrottle::OnTransferComplete,
-                 weak_ptr_factory_.GetWeakPtr()));
-}
-
-void NavigationResourceThrottle::OnTransferComplete() {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  DCHECK(in_cross_site_transition_);
-  in_cross_site_transition_ = false;
-
-  // If the results of the checks on the UI thread are known, unblock the
-  // navigation. Otherwise, wait until the callback has executed.
-  if (on_transfer_done_result_ != NavigationThrottle::DEFER) {
-    OnUIChecksPerformed(on_transfer_done_result_);
-    on_transfer_done_result_ = NavigationThrottle::DEFER;
-  }
-}
-
 }  // namespace content