PlzNav: Fix NavigationControllerBrowserTest.EnsureSamePageNavigationUpdatesFrameNaviga…

content/browser/frame_host/navigation_request.cc

Index: content/browser/frame_host/navigation_request.cc
diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/frame_host/navigation_request.cc
index 0c6494043863b5c8aaadac1ca800c736a796cbc7..b81af5a915dd1b2a772b4a8c520fd239afe31f27 100644
--- a/content/browser/frame_host/navigation_request.cc
+++ b/content/browser/frame_host/navigation_request.cc
@@ -383,6 +383,16 @@ void NavigationRequest::OnResponseStarted(
   NavigatorImpl::CheckWebUIRendererDoesNotDisplayNormalURL(render_frame_host,
                                                            common_params_.url);
 
+  if (render_frame_host->GetLastCommittedURL() ==
+          navigation_handle_->original_url() &&
+      common_params_.navigation_type == FrameMsg_Navigate_Type::NORMAL &&
+      navigation_handle_->WasServerRedirect() &&

[clamy, 2016/10/05 12:47:04]

Is the redirect part needed? Otherwise, when we create the nav request, we could
just determine that we're trying to navigate to the same url we navigated to,
and that this is like a reload. This way, we don't need to do a comparison of
the original url.

[nasko, 2016/10/05 22:07:09]

Yeah, I'm not sure why we have the redirect check here. Actually, having a
redirect when loading an URL shouldn't cause us to reload the original, should
it?

+      ui::PageTransitionCoreTypeIs(navigation_handle_->GetPageTransition(),
+                                   ui::PAGE_TRANSITION_RELOAD)) {
+    common_params_.navigation_type =
+        FrameMsg_Navigate_Type::RELOAD_MAIN_RESOURCE;

[nasko, 2016/10/05 22:07:09]

I'm a bit afraid of such change. I do want us to do overall, as I'd like to
eliminate the SAME_PAGE classification, however in my naive CL for doing that,
there are lots of failures. https://codereview.chromium.org/2246363003/

+  }
+
   // For renderer-initiated navigations that are set to commit in a different
   // renderer, allow the embedder to cancel the transfer.
   if (!browser_initiated_ &&