Fix aborted navigates not clearing the pending navigation entry with PlzNavigate.

content/browser/frame_host/navigator_impl.h

 // 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.
 
 #ifndef CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_IMPL_H_
 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_IMPL_H_
 
 #include <memory>
 
 #include "base/containers/scoped_ptr_hash_map.h"
@@ skipping 79 matching lines @@
                         bool has_stale_copy_in_cache,
                         int error_code) override;
   void LogResourceRequestTime(base::TimeTicks timestamp,
                               const GURL& url) override;
   void LogBeforeUnloadTime(
       const base::TimeTicks& renderer_before_unload_start_time,
       const base::TimeTicks& renderer_before_unload_end_time) override;
   void CancelNavigation(FrameTreeNode* frame_tree_node) override;
   NavigationHandleImpl* GetNavigationHandleForFrameHost(
       RenderFrameHostImpl* render_frame_host) override;
+  void DiscardPendingEntryIfNeeded(NavigationHandleImpl* handle) override;
 
  private:
   // Holds data used to track browser side navigation metrics.
   struct NavigationMetricsData;
 
   friend class NavigatorTestWithBrowserSideNavigation;
   ~NavigatorImpl() override;
 
   // Navigates to the given entry, which might be the pending entry (if
   // |is_pending_entry| is true).  Private because all callers should use either
@@ skipping 28 matching lines @@
       const FrameHostMsg_DidCommitProvisionalLoad_Params& params,
       SiteInstance* site_instance);
 
   // Called when a navigation has started in a main frame, to update the pending
   // NavigationEntry if the controller does not currently have a
   // browser-initiated one.
   void DidStartMainFrameNavigation(const GURL& url,
                                    SiteInstanceImpl* site_instance,
                                    NavigationHandleImpl* navigation_handle);
 
-  // Called when a navigation has failed to discard the pending entry in order
-  // to avoid url spoofs.
-  void DiscardPendingEntryOnFailureIfNeeded(NavigationHandleImpl* handle);
-
   // The NavigationController that will keep track of session history for all
   // RenderFrameHost objects using this NavigatorImpl.
   // TODO(nasko): Move ownership of the NavigationController from
   // WebContentsImpl to this class.
   NavigationControllerImpl* controller_;
 
   // Used to notify the object embedding this Navigator about navigation
   // events. Can be NULL in tests.
   NavigatorDelegate* delegate_;
 
   std::unique_ptr<NavigatorImpl::NavigationMetricsData> navigation_data_;
 
   DISALLOW_COPY_AND_ASSIGN(NavigatorImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_IMPL_H_