PlzNavigate: don't stop all loaders when renderer-initiated nav fails

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 382 matching lines @@
       navigation_request_->common_params().navigation_type);
 
   DidStartLoading(to_different_document, was_previously_loading);
 }
 
 void FrameTreeNode::ResetNavigationRequest(bool keep_state,
                                            bool inform_renderer) {
   CHECK(IsBrowserSideNavigationEnabled());
   if (!navigation_request_)
     return;
-  bool was_renderer_initiated = !navigation_request_->browser_initiated();
+  int renderer_navigation_id =
+      navigation_request_->begin_params().renderer_navigation_id;
   NavigationRequest::AssociatedSiteInstanceType site_instance_type =
       navigation_request_->associated_site_instance_type();
   navigation_request_.reset();
 
   if (keep_state)
     return;
 
   // The RenderFrameHostManager should clean up any speculative RenderFrameHost
   // it created for the navigation. Also register that the load stopped.
   DidStopLoading();
   render_manager_.CleanUpNavigation();
 
   // When reusing the same SiteInstance, a pending WebUI may have been created
   // on behalf of the navigation in the current RenderFrameHost. Clear it.
   if (site_instance_type ==
       NavigationRequest::AssociatedSiteInstanceType::CURRENT) {
     current_frame_host()->ClearPendingWebUI();
   }
 
   // If the navigation is renderer-initiated, the renderer should also be
   // informed that the navigation stopped.
-  if (was_renderer_initiated && inform_renderer) {
-    current_frame_host()->Send(
-        new FrameMsg_Stop(current_frame_host()->GetRoutingID()));
+  if (renderer_navigation_id != kInvalidRenderNavigationId && inform_renderer) {
+    current_frame_host()->Send(new FrameMsg_DroppedNavigation(
+        current_frame_host()->GetRoutingID(), renderer_navigation_id));
   }
 
 }
 
 bool FrameTreeNode::has_started_loading() const {
   return loading_progress_ != kLoadingProgressNotStarted;
 }
 
 void FrameTreeNode::reset_loading_progress() {
   loading_progress_ = kLoadingProgressNotStarted;
@@ skipping 121 matching lines @@
       }
       return parent_->child_at(i + relative_offset);
     }
   }
 
   NOTREACHED() << "FrameTreeNode not found in its parent's children.";
   return nullptr;
 }
 
 }  // namespace content