Use SameDocument term in tests instead of SamePage.

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 6020 matching lines @@
   // being reused.
   EXPECT_TRUE(ExecuteScript(root, kAddNamedFrameScript));
   EXPECT_EQ(1U, root->child_count());
   EXPECT_EQ(1U, nav_entry->root_node()->children.size());
   EXPECT_EQ(tree_node, nav_entry->root_node()->children[0]);
 
   EXPECT_TRUE(ExecuteScript(root, kRemoveFrameScript));
   EXPECT_EQ(0U, root->child_count());
 }
 
-// Test that navigations classified as SAME_PAGE properly update all the

[Charlie Reis, 2017/03/10 21:01:38]

We should leave this as SAME_PAGE.  (See below for details.)

[Eugene But (OOO till 7-30), 2017/03/10 21:41:59]

Done.

-// members of FrameNavigationEntry. If not, it is possible to get a mismatch
-// between the origin and URL of a document as seen in
+// Test that navigations classified as same document navigaiton properly update
+// all the members of FrameNavigationEntry. If not, it is possible to get a
+// mismatch between the origin and URL of a document as seen in
 // https://crbug.com/630103.
-IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
-                       EnsureSamePageNavigationUpdatesFrameNavigationEntry) {

[Charlie Reis, 2017/03/10 21:01:38]

We should leave the test name here as is, unless we plan to change
NAVIGATION_TYPE_SAME_PAGE.  (See below.)

[Eugene But (OOO till 7-30), 2017/03/10 21:41:59]

Done.

+IN_PROC_BROWSER_TEST_F(
+    NavigationControllerBrowserTest,
+    EnsureSameDocumentNavigationUpdatesFrameNavigationEntry) {
   WebContentsImpl* web_contents =
       static_cast<WebContentsImpl*>(shell()->web_contents());
   FrameTreeNode* root = web_contents->GetFrameTree()->root();
 
-  // Navigate to a simple page and then perform an in-page navigation.
+  // Navigate to a simple page and then perform a fragment change navigation.
   GURL start_url(embedded_test_server()->GetURL("a.com", "/title1.html"));
   EXPECT_TRUE(NavigateToURL(shell(), start_url));
 
-  GURL same_page_url(
+  GURL fragment_change_url(
       embedded_test_server()->GetURL("a.com", "/title1.html#foo"));
-  EXPECT_TRUE(NavigateToURL(shell(), same_page_url));
+  EXPECT_TRUE(NavigateToURL(shell(), fragment_change_url));
   EXPECT_EQ(2, web_contents->GetController().GetEntryCount());
 
   // Replace the URL of the current NavigationEntry with one that will cause
   // a server redirect when loaded.
   {
     GURL redirect_dest_url(
         embedded_test_server()->GetURL("sub.a.com", "/simple_page.html"));
     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());
     observer.Wait();
   }
 
   // Prior to fixing the issue, the above omnibox navigation (which is
-  // classified as SAME_PAGE) was leaving the FrameNavigationEntry with the
+  // classified as same document) was leaving the FrameNavigationEntry with the

[Charlie Reis, 2017/03/10 21:01:38]

No, this needs to stay SAME_PAGE for now, because it refers to a particular
NAVIGATION_TYPE_SAME_PAGE classification that was important in reproducing the
bug.

Note that NAVIGATION_SAME_PAGE is not the same as the ones we're changing (e.g,
fragments, pushstate, etc).  It refers to cases like hitting enter in the
address bar, where we reload the whole page by navigating to it again, without
treating it as a reload.  See this declaration comment:

  // The same page has been reloaded as a result of the user requesting
  // navigation to that same page (like pressing Enter in the URL bar). This
  // is not the same as an in-page navigation because we'll actually have a
  // pending entry for the load, which is then meaningless.
  NAVIGATION_TYPE_SAME_PAGE,


It's possible we could update the phrasing of this, but I think it's important
to distinguish it from the "same document" navigations we're referring to
everywhere else (fragments, etc).

[Eugene But (OOO till 7-30), 2017/03/10 21:41:59]

Done.

   // 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.
+  // consider it as same document 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();
   }
 
   // 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(
@@ skipping 47 matching lines @@
     return true;
   }
 
   GURL url_;
   WebContentsImpl* web_contents_;
 
   DISALLOW_COPY_AND_ASSIGN(GoBackAndCommitFilter);
 };
 
 // Test which simulates a race condition between a cross-origin, same-process
-// navigation and a same page session history navigation. When such a race
+// navigation and a same document session history navigation. When such a race
 // occurs, the renderer will commit the cross-origin navigation, updating its
 // version of the current document sequence number, and will send an IPC to the
 // browser process. The session history navigation comes after the commit for
 // the cross-origin navigation and updates the URL, but not the origin of the
 // document. This results in mismatch between the two and causes the renderer
 // process to be killed. See https://crbug.com/630103.
-IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
-                       RaceCrossOriginNavigationAndSamePageHistoryNavigation) {
+IN_PROC_BROWSER_TEST_F(
+    NavigationControllerBrowserTest,
+    RaceCrossOriginNavigationAndSameDocumentHistoryNavigation) {
   WebContentsImpl* web_contents =
       static_cast<WebContentsImpl*>(shell()->web_contents());
   FrameTreeNode* root = web_contents->GetFrameTree()->root();
 
-  // Navigate to a simple page and then perform an in-page navigation.
+  // Navigate to a simple page and then perform a same document navigation.
   GURL start_url(embedded_test_server()->GetURL("a.com", "/title1.html"));
   EXPECT_TRUE(NavigateToURL(shell(), start_url));
 
-  GURL same_page_url(
+  GURL same_document_url(
       embedded_test_server()->GetURL("a.com", "/title1.html#foo"));
-  EXPECT_TRUE(NavigateToURL(shell(), same_page_url));
+  EXPECT_TRUE(NavigateToURL(shell(), same_document_url));
   EXPECT_EQ(2, web_contents->GetController().GetEntryCount());
 
   // Create a GoBackAndCommitFilter, which will delay the commit IPC for a
   // cross-origin, same process navigation and will perform a GoBack.
   GURL cross_origin_url(
       embedded_test_server()->GetURL("suborigin.a.com", "/title2.html"));
   scoped_refptr<GoBackAndCommitFilter> filter =
       new GoBackAndCommitFilter(cross_origin_url, web_contents);
   web_contents->GetMainFrame()->GetProcess()->AddFilter(filter.get());
 
@@ skipping 23 matching lines @@
     web_contents->GetController().GoBack();
     EXPECT_TRUE(WaitForLoadStop(shell()->web_contents()));
     EXPECT_EQ(1, 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.
     EXPECT_TRUE(ExecuteScriptAndExtractString(
         web_contents, "domAutomationController.send(document.origin)",
         &origin));
-    EXPECT_EQ(same_page_url.GetOrigin().spec(), origin + "/");
+    EXPECT_EQ(same_document_url.GetOrigin().spec(), origin + "/");
   } 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;
@@ skipping 441 matching lines @@
     was_same_page_ = handle->IsSameDocument();
     was_renderer_initiated_ = handle->IsRendererInitiated();
   }
 
   const GURL url_;
   bool has_committed_;
   bool was_same_page_;
   bool was_renderer_initiated_;
 };
 
-// Test that a same-page navigation does not lead to the deletion of the
-// NavigationHandle for an ongoing different page navigation.
+// Test that a same document navigation does not lead to the deletion of the
+// NavigationHandle for an ongoing different document navigation.
 IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
-                       SamePageNavigationDoesntDeleteNavigationHandle) {
+                       SameDocumentNavigationDoesntDeleteNavigationHandle) {
   const GURL kURL1 = embedded_test_server()->GetURL("/title1.html");
   const GURL kPushStateURL =
       embedded_test_server()->GetURL("/title1.html#fragment");
   const GURL kURL2 = embedded_test_server()->GetURL("/title2.html");
 
   // Navigate to the initial page.
   EXPECT_TRUE(NavigateToURL(shell(), kURL1));
   RenderFrameHostImpl* main_frame =
       static_cast<WebContentsImpl*>(shell()->web_contents())->GetMainFrame();
   FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())
@@ skipping 49 matching lines @@
       shell()->web_contents()->GetController().GetLastCommittedEntry();
   ASSERT_TRUE(last_committed);
   EXPECT_EQ(kURL2, last_committed->GetURL());
 
   EXPECT_TRUE(navigation_observer.has_committed());
   EXPECT_FALSE(navigation_observer.was_same_page());
   EXPECT_FALSE(navigation_observer.was_renderer_initiated());
 
 }
 
-// Tests that a same-page browser-initiated navigation is properly reported by
-// the NavigationHandle.
+// Tests that a same document browser-initiated navigation is properly reported
+// by the NavigationHandle.
 IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
-                       SamePageBrowserInitiated) {
+                       SameDocumentBrowserInitiated) {
   const GURL kURL = embedded_test_server()->GetURL("/title1.html");
   const GURL kFragmentURL =
       embedded_test_server()->GetURL("/title1.html#fragment");
 
   // Navigate to the initial page.
   EXPECT_TRUE(NavigateToURL(shell(), kURL));
 
   // Do a browser-initiated fragment navigation.
   NavigationHandleCommitObserver handle_observer(shell()->web_contents(),
                                                  kFragmentURL);
@@ skipping 24 matching lines @@
 
   // Do a 204 navigation.
   EXPECT_FALSE(NavigateToURL(shell(), kURL204));
 
   entry = controller.GetLastCommittedEntry();
   EXPECT_EQ(kURL, entry->GetURL());
   EXPECT_EQ(1, controller.GetEntryCount());
 }
 
 }  // namespace content