Remove IsSynchronous API from NavigationHandle.

content/browser/frame_host/render_frame_host_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/render_frame_host_impl.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 1156 matching lines @@
   process->FilterURL(true, &validated_params.searchable_form_url);
 
   // Without this check, the renderer can trick the browser into using
   // filenames it can't access in a future session restore.
   if (!CanAccessFilesOfPageState(validated_params.page_state)) {
     bad_message::ReceivedBadMessage(
         GetProcess(), bad_message::RFH_CAN_ACCESS_FILES_OF_PAGE_STATE);
     return;
   }
 
-  // If the URL does not match what the NavigationHandle expects, treat the
-  // commit as a new navigation. This can happen if an ongoing slow
-  // same-process navigation is interrupted by a synchronous renderer-initiated
-  // navigation.
+  // If the URL or |was_within_same_page| does not match what the
+  // NavigationHandle expects, treat the commit as a new navigation. This can
+  // happen if an ongoing slow same-process navigation is interwoven by a

[Charlie Reis, 2016/09/20 23:35:24]

nit: interwoven with

[nasko, 2016/10/27 17:26:59]

Done.

+  // synchronous renderer-initiated navigation.
   // TODO(csharrison): Data navigations loaded with LoadDataWithBaseURL get
   // reset here, because the NavigationHandle tracks the URL but the
   // validated_params.url tracks the data. The trick of saving the old entry ids
   // for these navigations should go away when this is properly handled. See
   // crbug.com/588317.
   int entry_id_for_data_nav = 0;
   bool is_renderer_initiated = true;
   if (navigation_handle_ &&
-      (navigation_handle_->GetURL() != validated_params.url)) {
+      ((navigation_handle_->GetURL() != validated_params.url) ||
+       navigation_handle_->IsSamePage() !=
+           validated_params.was_within_same_page)) {
     // Make sure that the pending entry was really loaded via
     // LoadDataWithBaseURL and that it matches this handle.
     NavigationEntryImpl* pending_entry =
         NavigationEntryImpl::FromNavigationEntry(
             frame_tree_node()->navigator()->GetController()->GetPendingEntry());
     bool pending_entry_matches_handle =
         pending_entry &&
         pending_entry->GetUniqueID() ==
             navigation_handle_->pending_nav_entry_id();
     // TODO(csharrison): The pending entry's base url should equal
     // |validated_params.base_url|. This is not the case for loads with invalid
     // base urls.
     if (navigation_handle_->GetURL() == validated_params.base_url &&
         pending_entry_matches_handle &&
         !pending_entry->GetBaseURLForDataURL().is_empty()) {
       entry_id_for_data_nav = navigation_handle_->pending_nav_entry_id();
       is_renderer_initiated = pending_entry->is_renderer_initiated();
     }
     navigation_handle_.reset();
   }
 
   // Synchronous renderer-initiated navigations will send a
   // DidCommitProvisionalLoad IPC without a prior DidStartProvisionalLoad
-  // message.
+  // message. Or in addition, the if block above can reset the NavigationHandle
+  // in cases it doesn't match the expected commit.
   if (!navigation_handle_) {
     // There is no pending NavigationEntry in these cases, so pass 0 as the
     // nav_id. If the previous handle was a prematurely aborted navigation
     // loaded via LoadDataWithBaseURL, propogate the entry id.
     navigation_handle_ = NavigationHandleImpl::Create(
-        validated_params.url, frame_tree_node_,
-        is_renderer_initiated,
-        true,  // is_synchronous
-        validated_params.is_srcdoc, base::TimeTicks::Now(),
-        entry_id_for_data_nav);
+        validated_params.url, frame_tree_node_, is_renderer_initiated,
+        validated_params.was_within_same_page, validated_params.is_srcdoc,

[Charlie Reis, 2016/09/20 23:35:24]

I agree with clamy@ that this can technically not match same_page in
DidCommitNavigation (after going through IsURLInPageNavigation), but that would
only happen in cases the renderer is killed anyway.  I *think* that's ok.

Actually, I wonder if that's why the PushStateWithoutPreviousEntry unit test is
failing.  (There's a line in that test output about trying to kill the
renderer.)

[nasko, 2016/10/27 17:26:59]

Acknowledged.

+        base::TimeTicks::Now(), entry_id_for_data_nav);
     // PlzNavigate
     if (IsBrowserSideNavigationEnabled()) {
       // PlzNavigate: synchronous loads happen in the renderer, and the browser
       // has not been notified about the start of the load yet. Do it now.
       if (!is_loading()) {
         bool was_loading = frame_tree_node()->frame_tree()->IsLoading();
         is_loading_ = true;
         frame_tree_node()->DidStartLoading(true, was_loading);
       }
       pending_commit_ = false;
@@ skipping 1866 matching lines @@
   web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind(
       &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this)));
   return web_bluetooth_service_.get();
 }
 
 void RenderFrameHostImpl::DeleteWebBluetoothService() {
   web_bluetooth_service_.reset();
 }
 
 }  // namespace content