Merge 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 04429831faa4c727f0e8322621a229d452090566..fc978a7992a6abaddbb69dab57cc5aa50abfef1b 100644
--- a/content/browser/frame_host/navigation_request.cc
+++ b/content/browser/frame_host/navigation_request.cc
@@ -336,8 +336,12 @@ 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)));
 }