PlzNav: Fix NavigationControllerBrowserTest.EnsureSamePageNavigationUpdatesFrameNaviga…

content/browser/frame_host/navigator_impl.cc

Index: content/browser/frame_host/navigator_impl.cc
diff --git a/content/browser/frame_host/navigator_impl.cc b/content/browser/frame_host/navigator_impl.cc
index 8466c51d4c00648f191c0630572ff4778a6fbd2d..dc3632ec7279fc53ad361999229d49a6b546d247 100644
--- a/content/browser/frame_host/navigator_impl.cc
+++ b/content/browser/frame_host/navigator_impl.cc
@@ -1098,6 +1098,11 @@ void NavigatorImpl::RequestNavigation(FrameTreeNode* frame_tree_node,
       frame_tree_node->current_frame_host()->ShouldDispatchBeforeUnload();
   FrameMsg_Navigate_Type::Value navigation_type =
       GetNavigationType(controller_->GetBrowserContext(), entry, reload_type);
+  if (navigation_type == FrameMsg_Navigate_Type::NORMAL &&

[clamy, 2016/10/10 11:48:02]

nit: add a comment explaining that a normal load of the current url should be
treated as a reload?

[scottmg, 2016/10/11 19:52:32]

Done.

+      frame_tree_node->current_url() == entry.GetURL() &&
+      !is_same_document_history_load) {
+    navigation_type = FrameMsg_Navigate_Type::RELOAD_MAIN_RESOURCE;

[nasko, 2016/10/10 22:04:22]

I think we are best doing this for both current navigation code and PlzNavigate.
I'd rather not have the two paths behave differently and the plus of doing it
for current navigation is that we can eliminate the SAME_PAGE navigation
classification.

[scottmg, 2016/10/11 19:52:32]

I tried this, but Android seems to have some legacy behaviour in webview as
tested by LoadDataWithBaseUrlTest#testHistoryUrl that fails after changing this
for everywhere.

I'm looking into the pain that is Android now, but assuming that's fixable, I
won't attempt the removal of SAME_PAGE in this CL but rather defer it to
another.

(Based on Charlie's calendar it looks like he likely won't get to this until
next week.)

+  }
   std::unique_ptr<NavigationRequest> scoped_request =
       NavigationRequest::CreateBrowserInitiated(
           frame_tree_node, dest_url, dest_referrer, frame_entry, entry,