PlzNav: Fix NavigationControllerBrowserTest.EnsureSamePageNavigationUpdatesFrameNaviga…

content/browser/frame_host/navigation_controller_impl.cc

Index: content/browser/frame_host/navigation_controller_impl.cc
diff --git a/content/browser/frame_host/navigation_controller_impl.cc b/content/browser/frame_host/navigation_controller_impl.cc
index 420e3fd1d6e77c6cd68710293df92ea490739f3b..d96400cf672bd7d711cd9059a95de59b6832afaf 100644
--- a/content/browser/frame_host/navigation_controller_impl.cc
+++ b/content/browser/frame_host/navigation_controller_impl.cc
@@ -1789,6 +1789,19 @@ void NavigationControllerImpl::NavigateToPendingEntry(ReloadType reload_type) {
         CancelForNavigation();
   }
 
+  // Note that we don't want to convert to a reload for history navigations, so

[Charlie Reis, 2016/11/01 21:18:40]

nit: It's not obvious what this block is doing at first glance, so I'd recommend
starting with something like "Convert enter-in-the-omnibox to a reload, since
that's how Blink treats it anyway."

[scottmg, 2016/11/01 22:14:30]

Done.

+  // this must be above the retrieval of the pending_entry_ below when
+  // pending_entry_index_ is used.
+  if (reload_type == ReloadType::NONE && GetLastCommittedEntry() &&
+      pending_entry_ && pending_entry_->frame_tree_node_id() == -1 &&
+      pending_entry_->GetURL() == GetLastCommittedEntry()->GetURL() &&
+      !pending_entry_->GetHasPostData() &&
+      // This check is required for Android WebView loadDataWithBaseURL.
+      GetLastCommittedEntry()->GetVirtualURL() ==
+          pending_entry_->GetVirtualURL()) {

[Charlie Reis, 2016/11/01 21:18:40]

Just as a sanity check, I patched this in and tried it on chrome://settings,
which seems to do the right thing (both GetURL and GetVirtualURL match between
pending and last committed, though not each other).

[scottmg, 2016/11/01 22:14:30]

Thanks for checking!

+    reload_type = ReloadType::MAIN_RESOURCE;
+  }
+
   // For session history navigations only the pending_entry_index_ is set.
   if (!pending_entry_) {
     CHECK_NE(pending_entry_index_, -1);