Avoid renderer kills for missing NavigationHandle in DidFail.

content/browser/frame_host/render_frame_host_impl.cc

 // Copyright 2013 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/render_frame_host_impl.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 887 matching lines @@
 
 void RenderFrameHostImpl::OnDidStartProvisionalLoad(
     const GURL& url,
     const base::TimeTicks& navigation_start) {
   frame_tree_node_->navigator()->DidStartProvisionalLoad(this, url,
                                                          navigation_start);
 }
 
 void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError(
     const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params) {
-  if (!navigation_handle_) {
-    bad_message::ReceivedBadMessage(
-        GetProcess(), bad_message::RFH_FAIL_PROVISIONAL_LOAD_NO_HANDLE);
-    return;
-  }
-
-  if (IsBrowserSideNavigationEnabled() &&
+  // TODO(clamy): Kill the renderer with RFH_FAIL_PROVISIONAL_LOAD_NO_HANDLE and
+  // return early if navigation_handle_ is null, once we prevent that case from
+  // happening in practice.
+  if (IsBrowserSideNavigationEnabled() && navigation_handle_ &&
       navigation_handle_->GetNetErrorCode() == net::OK) {
     // The renderer should not be sending this message unless asked to commit
     // an error page.
     // TODO(clamy): Stop sending DidFailProvisionalLoad IPCs at all when enough
     // observers have moved to DidFinishNavigation.
     bad_message::ReceivedBadMessage(
         GetProcess(), bad_message::RFH_FAIL_PROVISIONAL_LOAD_NO_ERROR);
     return;
   }
 
   // Update the error code in the NavigationHandle of the navigation.
   // PlzNavigate: this has already done in NavigationRequest::OnRequestFailed.
-  if (!IsBrowserSideNavigationEnabled()) {
+  if (!IsBrowserSideNavigationEnabled() && navigation_handle_) {
     navigation_handle_->set_net_error_code(
         static_cast<net::Error>(params.error_code));
   }
 
   frame_tree_node_->navigator()->DidFailProvisionalLoadWithError(this, params);
 }
 
 void RenderFrameHostImpl::OnDidFailLoadWithError(
     const GURL& url,
     int error_code,
@@ skipping 1834 matching lines @@
   // handler after it's destroyed so it can't run after the RFHI is destroyed.
   web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind(
       &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this)));
 }
 
 void RenderFrameHostImpl::DeleteWebBluetoothService() {
   web_bluetooth_service_.reset();
 }
 
 }  // namespace content