Do not reset NavigationHandle when navigating same-page

content/browser/frame_host/interstitial_page_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_INTERSTITIAL_PAGE_NAVIGATOR_IMPL_H_
 #define CONTENT_BROWSER_FRAME_HOST_INTERSTITIAL_PAGE_NAVIGATOR_IMPL_H_
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "content/browser/frame_host/navigation_handle_impl.h"
@@ skipping 12 matching lines @@
   InterstitialPageNavigatorImpl(
       InterstitialPageImpl* interstitial,
       NavigationControllerImpl* navigation_controller);
 
   NavigatorDelegate* GetDelegate() override;
   NavigationController* GetController() override;
   void DidStartProvisionalLoad(
       RenderFrameHostImpl* render_frame_host,
       const GURL& url,
       const base::TimeTicks& navigation_start) override;
-  void DidNavigate(RenderFrameHostImpl* render_frame_host,
-                   const FrameHostMsg_DidCommitProvisionalLoad_Params&
-                       input_params) override;
-  NavigationHandleImpl* GetNavigationHandleForFrameHost(
-      RenderFrameHostImpl* render_frame_host) override;
+  void DidNavigate(
+      RenderFrameHostImpl* render_frame_host,
+      const FrameHostMsg_DidCommitProvisionalLoad_Params& input_params,
+      std::unique_ptr<NavigationHandleImpl> navigation_handle) override;
 
  private:
   ~InterstitialPageNavigatorImpl() override;
 
   // The InterstitialPage with which this navigator object is associated.
   // Non owned pointer.
   InterstitialPageImpl* interstitial_;
 
   // The NavigationController associated with this navigator.
   NavigationControllerImpl* controller_;
 
-  // The NavigationHandle associated with the interstitial navigation.
-  // Interstitials are assumed to only have a single RenderFrameHost, so it's ok
-  // to track the NavigationHandle here rather than per-frame.
-  //
-  // Note: this NavigationHandleImpl will not send DidStartNavigation or
-  // DidFinishNavigation events to the WebContentsObserver, since those will go
-  // through InterstitialPageImpl as the NavigatorDelegate and get dropped.
-  std::unique_ptr<NavigationHandleImpl> navigation_handle_;
-
   DISALLOW_COPY_AND_ASSIGN(InterstitialPageNavigatorImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_INTERSTITIAL_PAGE_NAVIGATOR_IMPL_H_