Ensure that the PlzNavigate code path removes pending NavigationEntrys if the navigation is cancell…

content/browser/frame_host/frame_tree_node.cc

Index: content/browser/frame_host/frame_tree_node.cc
diff --git a/content/browser/frame_host/frame_tree_node.cc b/content/browser/frame_host/frame_tree_node.cc
index 2fdd79c55b1d9dc58ea8b75bce1127ca4e190dbb..1461438152b61e69e1dfef3a2d3d588840bd1532 100644
--- a/content/browser/frame_host/frame_tree_node.cc
+++ b/content/browser/frame_host/frame_tree_node.cc
@@ -497,8 +497,10 @@ void FrameTreeNode::DidChangeLoadProgress(double load_progress) {
 bool FrameTreeNode::StopLoading() {
   if (IsBrowserSideNavigationEnabled()) {
     if (navigation_request_) {
-      navigation_request_->navigation_handle()->set_net_error_code(
+      navigation_request_->navigation_handle()->set_net_error_code(
           net::ERR_ABORTED);
+      navigator_->DiscardPendingEntryIfNeeded(
+          navigation_request_->navigation_handle());
     }
     ResetNavigationRequest(false);
   }