PlzNavigate: make NavigationResourceHandler a LayeredResourceHandler

content/browser/frame_host/navigation_request.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/frame_host/navigation_request.h"
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "content/browser/appcache/appcache_navigation_handle.h"
@@ skipping 775 matching lines @@
     return;
   }
 
   loader_->FollowRedirect();
 }
 
 void NavigationRequest::OnWillProcessResponseChecksComplete(
     NavigationThrottle::ThrottleCheckResult result) {
   DCHECK(result != NavigationThrottle::DEFER);
 
+  // If the NavigationThrottles allowed the navigation to continue, have the
+  // processing of the response resume in the network stack.
+  if (result == NavigationThrottle::PROCEED)
+    loader_->ProceedWithResponse();

[mmenke, 2017/04/28 16:02:20]

Why move this?  This seems to be exclusive to the next two branches, which both
also have early returns, so this seems to make no difference.

[clamy, 2017/05/02 15:05:44]

Because in the case of downloads response_should_be_rendered_ should be rendered
is false, but we need the load to proceed in the network stack.

[mmenke, 2017/05/02 15:55:39]

Thanks!  Missed that case.

+
   // Abort the request if needed. This includes requests that were blocked by
   // NavigationThrottles and requests that should not commit (e.g. downloads,
   // 204/205s). This will destroy the NavigationRequest.
   if (result == NavigationThrottle::CANCEL_AND_IGNORE ||
       result == NavigationThrottle::CANCEL || !response_should_be_rendered_) {
     // TODO(clamy): distinguish between CANCEL and CANCEL_AND_IGNORE.
     OnRequestFailed(false, net::ERR_ABORTED);
 
     // DO NOT ADD CODE after this. The previous call to OnRequestFailed has
     // destroyed the NavigationRequest.
     return;
   }
 
   if (result == NavigationThrottle::BLOCK_RESPONSE) {
     OnRequestFailed(false, net::ERR_BLOCKED_BY_RESPONSE);
     // DO NOT ADD CODE after this. The previous call to OnRequestFailed has
     // destroyed the NavigationRequest.
     return;
   }
 
-  // Have the processing of the response resume in the network stack.
-  loader_->ProceedWithResponse();
-
   CommitNavigation();
 
   // DO NOT ADD CODE after this. The previous call to CommitNavigation caused
   // the destruction of the NavigationRequest.
 }
 
 void NavigationRequest::CommitNavigation() {
   DCHECK(response_ || !ShouldMakeNetworkRequestForURL(common_params_.url) ||
          navigation_handle_->IsSameDocument());
   DCHECK(!common_params_.url.SchemeIs(url::kJavaScriptScheme));
@@ skipping 11 matching lines @@
   DCHECK_EQ(request_params_.has_user_gesture, begin_params_.has_user_gesture);
 
   render_frame_host->CommitNavigation(response_.get(), std::move(body_),
                                       std::move(handle_), common_params_,
                                       request_params_, is_view_source_);
 
   frame_tree_node_->ResetNavigationRequest(true, true);
 }
 
 }  // namespace content