Do not reset NavigationHandle when navigating same-page

content/browser/frame_host/interstitial_page_navigator_impl.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/interstitial_page_navigator_impl.h"
 
 #include "content/browser/frame_host/interstitial_page_impl.h"
 #include "content/browser/frame_host/navigation_controller_impl.h"
 #include "content/browser/frame_host/navigator_delegate.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
@@ skipping 27 matching lines @@
                                    false,  // is_renderer_initiated
                                    false,  // is_synchronous
                                    false,  // is_srcdoc
                                    navigation_start,
                                    0,       // pending_nav_entry_id
                                    false);  // started_in_context_menu
 }
 
 void InterstitialPageNavigatorImpl::DidNavigate(
     RenderFrameHostImpl* render_frame_host,
-    const FrameHostMsg_DidCommitProvisionalLoad_Params& input_params) {
+    const FrameHostMsg_DidCommitProvisionalLoad_Params& input_params,
+    std::unique_ptr<NavigationHandleImpl> navigation_handle) {
   if (navigation_handle_) {
     navigation_handle_->DidCommitNavigation(input_params, false,

[Charlie Reis, 2016/11/03 22:02:22]

This looks incorrect now.  We should assume that same-page navigations are
possible on interstitial pages, since other embedders define their own
interstitials.

[clamy, 2016/11/04 14:18:21]

I'm now checking if the navigation that just committed is not same-page before
resetting the NavigationHandle for the interstitial page.

                                             render_frame_host);
     navigation_handle_.reset();
   }
 
   // TODO(nasko): Move implementation here, but for the time being call out
   // to the interstitial page code.
   interstitial_->DidNavigate(render_frame_host->render_view_host(),
                              input_params);
 }
 
 NavigationHandleImpl*
 InterstitialPageNavigatorImpl::GetNavigationHandleForFrameHost(
     RenderFrameHostImpl* render_frame_host) {
   return navigation_handle_.get();
 }
 
 }  // namespace content