PlzNavigate: identify same-page browser-initiated navigation.

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 <algorithm>
 #include <utility>
 #include <vector>
@@ skipping 2313 matching lines @@
         " Site A ------------ proxies for B\n"
         "   |--Site A ------- proxies for B\n"
         "   +--Site B ------- proxies for A\n"
         "Where A = http://127.0.0.1/\n"
         "      B = http://baz.com/",
         visualizer.DepictFrameTree(root));
   }
 }
 
 // Ensure that we don't crash when navigating subframes after in-page
-// navigations.  See https://crbug.com/522193.
+// navigations. See https://crbug.com/522193.

[nasko, 2017/01/13 19:36:56]

nit: No need for just empty space change.

[arthursonzogni, 2017/01/17 15:24:47]

Done.

 IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
                        FrameNavigationEntry_SubframeAfterInPage) {
   // 1. Start on a page with a subframe.
   GURL main_url(embedded_test_server()->GetURL(
       "/navigation_controller/page_with_iframe.html"));
   EXPECT_TRUE(NavigateToURL(shell(), main_url));
   const NavigationControllerImpl& controller =
       static_cast<const NavigationControllerImpl&>(
           shell()->web_contents()->GetController());
   FrameTreeNode* root =
@@ skipping 3814 matching lines @@
   web_contents->GetMainFrame()->GetProcess()->AddFilter(filter.get());
 
   // Navigate cross-origin, waiting for the commit to occur.
   UrlCommitObserver cross_origin_commit_observer(root, cross_origin_url);
   UrlCommitObserver history_commit_observer(root, start_url);
   shell()->LoadURL(cross_origin_url);
   cross_origin_commit_observer.Wait();
   EXPECT_EQ(cross_origin_url, web_contents->GetLastCommittedURL());
   EXPECT_EQ(2, web_contents->GetController().GetLastCommittedEntryIndex());
 
-  // Wait for the back navigation to commit as well.
-  history_commit_observer.Wait();
-  EXPECT_EQ(start_url, web_contents->GetLastCommittedURL());
-  EXPECT_EQ(0, web_contents->GetController().GetLastCommittedEntryIndex());
+  if (IsBrowserSideNavigationEnabled()) {
+    // With browser-side-navigation, the history navigation is dropped.
+    // Navigate to another URL to give the back navigation the opportunity to
+    // commit if it was not dropped.
+    GURL start_url(embedded_test_server()->GetURL("b.com", "/title1.html"));
+    EXPECT_TRUE(NavigateToURL(shell(), start_url));
+    EXPECT_EQ(3, web_contents->GetController().GetLastCommittedEntryIndex());
+    EXPECT_EQ(4, web_contents->GetController().GetEntryCount());
 
-  // Verify the expected origin through JavaScript. It also has the additional
-  // verification of the process also being still alive.
-  std::string origin;
-  EXPECT_TRUE(ExecuteScriptAndExtractString(
-      web_contents, "domAutomationController.send(document.origin)", &origin));
-  EXPECT_EQ(start_url.GetOrigin().spec(), origin + "/");
+    // Check that the renderer is still alive.
+    std::string is_alive;
+    EXPECT_TRUE(ExecuteScriptAndExtractString(
+        web_contents, "domAutomationController.send('alive')", &is_alive));

[nasko, 2017/01/13 19:36:56]

Why not use the origin? It gives you extra information to ensure we committed
the expected origin and not something else. Having the liveness check is a nice
to have, but it is more important that we committed the expected origin
similarly to non-PlzNavigate mode.

[arthursonzogni, 2017/01/17 15:24:47]

Done.

+    EXPECT_EQ("alive", is_alive);
+  } else {
+    // Wait for the back navigation to commit as well.
+    history_commit_observer.Wait();
+    EXPECT_EQ(start_url, web_contents->GetLastCommittedURL());
+    EXPECT_EQ(0, web_contents->GetController().GetLastCommittedEntryIndex());
+    EXPECT_EQ(3, web_contents->GetController().GetEntryCount());
+
+    // Verify the expected origin through JavaScript. It also has the additional
+    // verification of the process also being still alive.
+    std::string origin;
+    EXPECT_TRUE(ExecuteScriptAndExtractString(
+        web_contents, "domAutomationController.send(document.origin)",
+        &origin));
+    EXPECT_EQ(start_url.GetOrigin().spec(), origin + "/");
+  }
 }
 
 // Test that verifies that Referer and Origin http headers are correctly sent
 // to the final destination of a cross-site POST with a few redirects thrown in.
 // This test is somewhat related to https://crbug.com/635400.
 IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
                        RefererAndOriginHeadersAfterRedirects) {
   // Navigate to the page with form that posts via 307 redirection to
   // |redirect_target_url| (cross-site from |form_url|).  Using 307 (rather than
   // 302) redirection is important to preserve the HTTP method and POST body.
@@ skipping 521 matching lines @@
   NavigationHandleCommitObserver handle_observer(shell()->web_contents(),
                                                  kFragmentURL);
   EXPECT_TRUE(NavigateToURL(shell(), kFragmentURL));
 
   EXPECT_TRUE(handle_observer.has_committed());
   EXPECT_TRUE(handle_observer.was_same_page());
   EXPECT_FALSE(handle_observer.was_renderer_initiated());
 }
 
 }  // namespace content