PlzNavigate: properly update NavigationHandle for 204/205 and download responses

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 "content/browser/child_process_security_policy_impl.h"
 #include "content/browser/devtools/render_frame_devtools_agent_host.h"
@@ skipping 361 matching lines @@
 }
 
 void NavigationRequest::OnResponseStarted(
     const scoped_refptr<ResourceResponse>& response,
     std::unique_ptr<StreamHandle> body,
     const SSLStatus& ssl_status,
     std::unique_ptr<NavigationData> navigation_data) {
   DCHECK(state_ == STARTED);
   state_ = RESPONSE_STARTED;
 
-  // HTTP 204 (No Content) and HTTP 205 (Reset Content) responses should not
-  // commit; they leave the frame showing the previous page.
   DCHECK(response);
-  if (response->head.headers.get() &&
-      (response->head.headers->response_code() == 204 ||
-       response->head.headers->response_code() == 205)) {

[clamy, 2016/11/21 16:57:14]

If the issue is just the error code in the NavigationHandle, you can do
navigation_handle_->set_net_error_code(net::ERR_ABORTED) here, instead of moving
this block. I think it is clearer.

[yzshen1, 2016/11/21 17:52:50]

At least MetricsWebContentsObserver::DidFinishNavigation currently requires
response headers to be set as well. Maybe there are/will be others needing such
info.

It seems more consistent to update the navigation handle using
NavigationHandleImpl::WillProcessResponse. WDYT?

-    frame_tree_node_->navigator()->DiscardPendingEntryIfNeeded(
-        navigation_handle_.get());
-    frame_tree_node_->ResetNavigationRequest(false);
-    return;
-  }
 
   // Update the service worker params of the request params.
   bool did_create_service_worker_host =
       navigation_handle_->service_worker_handle() &&
       navigation_handle_->service_worker_handle()
               ->service_worker_provider_host_id() !=
           kInvalidServiceWorkerProviderId;
   request_params_.service_worker_provider_id =
       did_create_service_worker_host
           ? navigation_handle_->service_worker_handle()
@@ skipping 158 matching lines @@
   }
 
   loader_->FollowRedirect();
 }
 
 void NavigationRequest::OnWillProcessResponseChecksComplete(
     NavigationThrottle::ThrottleCheckResult result) {
   CHECK(result != NavigationThrottle::DEFER);
 
   // Abort the request if needed. This will destroy the NavigationRequest.
-  if (result == NavigationThrottle::CANCEL_AND_IGNORE ||
-      result == NavigationThrottle::CANCEL) {
-    // TODO(clamy): distinguish between CANCEL and CANCEL_AND_IGNORE.
+  if (result == NavigationThrottle::CANCEL_AND_IGNORE) {
+    frame_tree_node_->navigator()->DiscardPendingEntryIfNeeded(
+        navigation_handle_.get());
     frame_tree_node_->ResetNavigationRequest(false);
     return;
   }
+  if (result == NavigationThrottle::CANCEL) {
+    frame_tree_node_->ResetNavigationRequest(false);
+    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.
 }
 
@@ skipping 14 matching lines @@
   DCHECK_EQ(request_params_.has_user_gesture, begin_params_.has_user_gesture);
 
   render_frame_host->CommitNavigation(response_.get(), std::move(body_),
                                       common_params_, request_params_,
                                       is_view_source_);
 
   frame_tree_node_->ResetNavigationRequest(true);
 }
 
 }  // namespace content