PlzNav: Fix NavigationControllerBrowserTest.EnsureSamePageNavigationUpdatesFrameNaviga…

content/browser/frame_host/navigation_controller_impl_browsertest.cc

 // Copyright 2014 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/navigation_controller_impl.h"
 
 #include <stdint.h>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 6031 matching lines @@
     TestNavigationObserver observer(web_contents);
     std::string script = "history.replaceState({}, '', '/server-redirect?" +
                          redirect_dest_url.spec() + "')";
     EXPECT_TRUE(ExecuteScript(root, script));
     observer.Wait();
   }
 
   // Simulate the user hitting Enter in the omnibox without changing the URL.
   {
     TestNavigationObserver observer(web_contents);
-    web_contents->GetController().LoadURL(web_contents->GetLastCommittedURL(),
-                                          Referrer(), ui::PAGE_TRANSITION_LINK,
-                                          std::string());
+    web_contents->GetController().LoadURL(
+        web_contents->GetLastCommittedURL(), Referrer(),
+        ui::PAGE_TRANSITION_RELOAD, std::string());

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

Are we sure that in the case described above we would get a
ui::PAGE_TRANSITION_RELOAD? I know that in NavigationController we do have a
special case for the user wanted to navigate to the same url but didn't actually
click on the reload button. I suspect we may not get a value of RELOAD in that
case.

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

You are correct. Selecting the current URL in the omnibox and hitting enter does
not result in a RELOAD transition. The usage of LINK is *intentional*. When the
commit comes back to the browser, it matches the pending navigation entry and we
classify it as SAME_PAGE.
The question is why is this not classified as SAME_PAGE in PlzNavigate here. It
looks like we have a browser test for that -
NavigationTypeClassification_SamePage, which is passing.

     observer.Wait();
   }
 
+  EXPECT_EQ(2, web_contents->GetController().GetEntryCount());
+
   // Prior to fixing the issue, the above omnibox navigation (which is
   // classified as SAME_PAGE) was leaving the FrameNavigationEntry with the
   // same document sequence number as the previous entry but updates the URL.
   // Doing a back session history navigation now will cause the browser to
   // consider it as in-page because of this matching document sequence number
   // and lead to a mismatch of origin and URL in the renderer process.
   {
     TestNavigationObserver observer(web_contents);
     web_contents->GetController().GoBack();
     observer.Wait();
@@ skipping 378 matching lines @@
   histogram.ExpectTotalCount(kReloadToReloadMetricName, 4);
   histogram.ExpectTotalCount(kReloadMainResourceToReloadMetricName, 3);
 
   controller.ReloadToRefreshContent(false);
   EXPECT_TRUE(WaitForLoadStop(shell()->web_contents()));
   histogram.ExpectTotalCount(kReloadToReloadMetricName, 4);
   histogram.ExpectTotalCount(kReloadMainResourceToReloadMetricName, 3);
 }
 
 }  // namespace content