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 c9b5879dab9fa5ef926e83a3da5d934df439b107..2593313f62838f5d99710d05e75e6666c272623f 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.

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

Do you plan to resolve this TODO before committing this CL or do it in a
separate one?

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

No I plan to do it in a separate one. Since this is for transfers, I don't need
to pass them in PlzNavigate. However we should do it in the future for the XFO
throttle to work.

   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)));
 }