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

content/browser/frame_host/frame_tree_node.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/frame_tree_node.h"
 
 #include <queue>
 #include <utility>
 
 #include "base/lazy_instance.h"
@@ skipping 481 matching lines @@
 void FrameTreeNode::DidChangeLoadProgress(double load_progress) {
   loading_progress_ = load_progress;
   frame_tree_->UpdateLoadProgress();
 }
 
 bool FrameTreeNode::StopLoading() {
   if (IsBrowserSideNavigationEnabled()) {
     if (navigation_request_) {
       navigation_request_->navigation_handle()->set_net_error_code(
           net::ERR_ABORTED);
+      navigator_->DiscardPendingEntryIfNeeded(
+          navigation_request_->navigation_handle());
     }
     ResetNavigationRequest(false);
   }
 
   // TODO(nasko): see if child frames should send IPCs in site-per-process
   // mode.
   if (!IsMainFrame())
     return true;
 
   render_manager_.Stop();
@@ skipping 46 matching lines @@
       }
       return parent_->child_at(i + relative_offset);
     }
   }
 
   NOTREACHED() << "FrameTreeNode not found in its parent's children.";
   return nullptr;
 }
 
 }  // namespace content