Ensure that all code paths which call FrameTreeNode::ResetNavigationRequest set NavigationHandle::G…

content/browser/frame_host/navigator_impl.cc

Index: content/browser/frame_host/navigator_impl.cc
diff --git a/content/browser/frame_host/navigator_impl.cc b/content/browser/frame_host/navigator_impl.cc
index c677f372f5767093b64cb134621ef84a3f4c3e10..1008c9575d7653d71c5196db652c2de06ce2954e 100644
--- a/content/browser/frame_host/navigator_impl.cc
+++ b/content/browser/frame_host/navigator_impl.cc
@@ -1051,6 +1051,12 @@ void NavigatorImpl::OnAbortNavigation(FrameTreeNode* frame_tree_node) {
 void NavigatorImpl::CancelNavigation(FrameTreeNode* frame_tree_node,
                                      bool inform_renderer) {
   CHECK(IsBrowserSideNavigationEnabled());
+  if (frame_tree_node->navigation_request() &&
+      frame_tree_node->navigation_request()->navigation_handle()) {
+    frame_tree_node->navigation_request()
+        ->navigation_handle()
+        ->set_net_error_code(net::ERR_ABORTED);
+  }
   frame_tree_node->ResetNavigationRequest(false, inform_renderer);
   if (frame_tree_node->IsMainFrame())
     navigation_data_.reset();