Revert the merge of CrossSiteResourceHandler and NavigationResourceThrottle.

content/browser/frame_host/navigation_request.cc

Index: content/browser/frame_host/navigation_request.cc
diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/frame_host/navigation_request.cc
index ba3a117e4417e3e3a67248fc1d29f30a8d6210f5..a2375dfb8409129444e497072788e48aacb7f7c0 100644
--- a/content/browser/frame_host/navigation_request.cc
+++ b/content/browser/frame_host/navigation_request.cc
@@ -406,12 +406,8 @@ void NavigationRequest::OnResponseStarted(
   body_ = std::move(body);
 
   // Check if the navigation should be allowed to proceed.
-  // TODO(clamy): pass the right values for request_id, is_download and
-  // is_stream.
   navigation_handle_->WillProcessResponse(
       render_frame_host, response->head.headers.get(), ssl_status,
-      GlobalRequestID(), common_params_.should_replace_current_entry, false,
-      false, base::Closure(),
       base::Bind(&NavigationRequest::OnWillProcessResponseChecksComplete,
                  base::Unretained(this)));
 }