PlzNavigate: Call NavigationHandle::WillProcessResponse for 204/205s

content/browser/frame_host/navigation_handle_impl.cc

 // Copyright 2015 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_handle_impl.h"
 
 #include "base/debug/dump_without_crashing.h"
 #include "base/logging.h"
 #include "content/browser/appcache/appcache_navigation_handle.h"
 #include "content/browser/appcache/appcache_service_impl.h"
@@ skipping 10 matching lines @@
 #include "content/browser/service_worker/service_worker_navigation_handle.h"
 #include "content/common/frame_messages.h"
 #include "content/common/resource_request_body_impl.h"
 #include "content/common/site_isolation_policy.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/navigation_ui_data.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/common/browser_side_navigation_policy.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/url_constants.h"
+#include "net/base/net_errors.h"
 #include "net/url_request/redirect_info.h"
 #include "url/gurl.h"
 #include "url/url_constants.h"
 
 namespace content {
 
 namespace {
 
 void UpdateThrottleCheckResult(
     NavigationThrottle::ThrottleCheckResult* to_update,
@@ skipping 629 matching lines @@
 bool NavigationHandleImpl::MaybeTransferAndProceed() {
   DCHECK_EQ(WILL_PROCESS_RESPONSE, state_);
 
   // Check if the navigation should transfer. This may result in the
   // destruction of this NavigationHandle, and the cancellation of the request.
   if (!MaybeTransferAndProceedInternal())
     return false;
 
   // Inform observers that the navigation is now ready to commit, unless a
   // transfer of the navigation failed.
-  ReadyToCommitNavigation(render_frame_host_);
+  // PlzNavigate: when a navigation is not set to commit (204/205s/downloads) do
+  // not call ReadyToCommitNavigation.
+  DCHECK(!IsBrowserSideNavigationEnabled() || render_frame_host_ ||
+         net_error_code_ == net::ERR_ABORTED);
+  if (!IsBrowserSideNavigationEnabled() || render_frame_host_)
+    ReadyToCommitNavigation(render_frame_host_);
   return true;
 }
 
 bool NavigationHandleImpl::MaybeTransferAndProceedInternal() {
-  DCHECK(render_frame_host_);
+  DCHECK(render_frame_host_ || (IsBrowserSideNavigationEnabled() &&
+                                net_error_code_ == net::ERR_ABORTED));
 
   // PlzNavigate: the final RenderFrameHost handling this navigation has been
   // decided before calling WillProcessResponse in
   // NavigationRequest::OnResponseStarted.
   // TODO(clamy): See if PlzNavigate could use this code to check whether to
   // use the RFH determined at the start of the navigation or to switch to
   // another one.
   if (IsBrowserSideNavigationEnabled())
     return true;
 
@@ skipping 98 matching lines @@
     throttles_.push_back(std::move(ancestor_throttle));
 
   if (throttles_to_register.size() > 0) {
     throttles_.insert(throttles_.begin(), throttles_to_register.begin(),
                       throttles_to_register.end());
     throttles_to_register.weak_clear();
   }
 }
 
 }  // namespace content