Renamed NavigationHandle::IsSamePage to NavigationHandle::IsSameDocument

content/browser/frame_host/navigation_handle_impl_browsertest.cc

 // Copyright 2016 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 "base/memory/weak_ptr.h"
 #include "content/browser/frame_host/navigation_handle_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/request_context_type.h"
@@ skipping 28 matching lines @@
 
     handle_ = navigation_handle;
     has_committed_ = false;
     is_error_ = false;
     page_transition_ = ui::PAGE_TRANSITION_LINK;
     last_committed_url_ = GURL();
 
     is_main_frame_ = navigation_handle->IsInMainFrame();
     is_parent_main_frame_ = navigation_handle->IsParentMainFrame();
     is_renderer_initiated_ = navigation_handle->IsRendererInitiated();
-    is_same_page_ = navigation_handle->IsSamePage();
+    is_same_document_ = navigation_handle->IsSameDocument();
     was_redirected_ = navigation_handle->WasServerRedirect();
     frame_tree_node_id_ = navigation_handle->GetFrameTreeNodeId();
   }
 
   void DidFinishNavigation(NavigationHandle* navigation_handle) override {
     if (navigation_handle != handle_)
       return;
 
     DCHECK_EQ(is_main_frame_, navigation_handle->IsInMainFrame());
     DCHECK_EQ(is_parent_main_frame_, navigation_handle->IsParentMainFrame());
-    DCHECK_EQ(is_same_page_, navigation_handle->IsSamePage());
+    DCHECK_EQ(is_same_document_, navigation_handle->IsSameDocument());
     DCHECK_EQ(is_renderer_initiated_, navigation_handle->IsRendererInitiated());
     DCHECK_EQ(frame_tree_node_id_, navigation_handle->GetFrameTreeNodeId());
 
     was_redirected_ = navigation_handle->WasServerRedirect();
     net_error_code_ = navigation_handle->GetNetErrorCode();
 
     if (navigation_handle->HasCommitted()) {
       has_committed_ = true;
       if (!navigation_handle->IsErrorPage()) {
         page_transition_ = navigation_handle->GetPageTransition();
         last_committed_url_ = navigation_handle->GetURL();
       } else {
         is_error_ = true;
       }
     } else {
       has_committed_ = false;
       is_error_ = true;
     }
 
     handle_ = nullptr;
   }
 
   bool has_committed() { return has_committed_; }
   bool is_error() { return is_error_; }
   bool is_main_frame() { return is_main_frame_; }
   bool is_parent_main_frame() { return is_parent_main_frame_; }
   bool is_renderer_initiated() { return is_renderer_initiated_; }
-  bool is_same_page() { return is_same_page_; }
+  bool is_same_document() { return is_same_document_; }
   bool was_redirected() { return was_redirected_; }
   int frame_tree_node_id() { return frame_tree_node_id_; }
 
   const GURL& last_committed_url() { return last_committed_url_; }
 
   ui::PageTransition page_transition() { return page_transition_; }
 
   net::Error net_error_code() { return net_error_code_; }
 
  private:
   // A reference to the NavigationHandle so this class will track only
   // one navigation at a time. It is set at DidStartNavigation and cleared
   // at DidFinishNavigation before the NavigationHandle is destroyed.
   NavigationHandle* handle_ = nullptr;
   bool has_committed_ = false;
   bool is_error_ = false;
   bool is_main_frame_ = false;
   bool is_parent_main_frame_ = false;
   bool is_renderer_initiated_ = true;
-  bool is_same_page_ = false;
+  bool is_same_document_ = false;
   bool was_redirected_ = false;
   int frame_tree_node_id_ = -1;
   ui::PageTransition page_transition_ = ui::PAGE_TRANSITION_LINK;
   GURL expected_start_url_;
   GURL last_committed_url_;
   net::Error net_error_code_ = net::OK;
 };
 
 // A test NavigationThrottle that will return pre-determined checks and run
 // callbacks when the various NavigationThrottle methods are called. It is
@@ skipping 389 matching lines @@
   NavigationHandleObserver observer(shell()->web_contents(),
                                     GURL(kAboutSrcDocURL));
 
   EXPECT_TRUE(NavigateToURL(shell(), url));
 
   EXPECT_TRUE(observer.has_committed());
   EXPECT_FALSE(observer.is_error());
   EXPECT_EQ(GURL(kAboutSrcDocURL), observer.last_committed_url());
 }
 
-// Ensure that the IsSamePage() method on NavigationHandle behaves correctly.
-IN_PROC_BROWSER_TEST_F(NavigationHandleImplBrowserTest, VerifySamePage) {
+// Ensure that the IsSameDocument() method on NavigationHandle behaves
+// correctly.
+IN_PROC_BROWSER_TEST_F(NavigationHandleImplBrowserTest, VerifySameDocument) {
   GURL url(embedded_test_server()->GetURL(
       "a.com", "/cross_site_iframe_factory.html?a(a())"));
   EXPECT_TRUE(NavigateToURL(shell(), url));
 
   FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())
                             ->GetFrameTree()
                             ->root();
   {
     NavigationHandleObserver observer(
         shell()->web_contents(),
         embedded_test_server()->GetURL("a.com", "/foo"));
     EXPECT_TRUE(ExecuteScript(root->child_at(0),
                               "window.history.pushState({}, '', 'foo');"));
 
     EXPECT_TRUE(observer.has_committed());
     EXPECT_FALSE(observer.is_error());
-    EXPECT_TRUE(observer.is_same_page());
+    EXPECT_TRUE(observer.is_same_document());
   }
   {
     NavigationHandleObserver observer(
         shell()->web_contents(),
         embedded_test_server()->GetURL("a.com", "/bar"));
     EXPECT_TRUE(ExecuteScript(root->child_at(0),
                               "window.history.replaceState({}, '', 'bar');"));
 
     EXPECT_TRUE(observer.has_committed());
     EXPECT_FALSE(observer.is_error());
-    EXPECT_TRUE(observer.is_same_page());
+    EXPECT_TRUE(observer.is_same_document());
   }
   {
     NavigationHandleObserver observer(
         shell()->web_contents(),
         embedded_test_server()->GetURL("a.com", "/bar#frag"));
     EXPECT_TRUE(
         ExecuteScript(root->child_at(0), "window.location.replace('#frag');"));
 
     EXPECT_TRUE(observer.has_committed());
     EXPECT_FALSE(observer.is_error());
-    EXPECT_TRUE(observer.is_same_page());
+    EXPECT_TRUE(observer.is_same_document());
   }
 
   GURL about_blank_url(url::kAboutBlankURL);
   {
     NavigationHandleObserver observer(shell()->web_contents(), about_blank_url);
     EXPECT_TRUE(ExecuteScript(
         root, "document.body.appendChild(document.createElement('iframe'));"));
 
     EXPECT_TRUE(observer.has_committed());
     EXPECT_FALSE(observer.is_error());
-    EXPECT_FALSE(observer.is_same_page());
+    EXPECT_FALSE(observer.is_same_document());
     EXPECT_EQ(about_blank_url, observer.last_committed_url());
   }
   {
     NavigationHandleObserver observer(shell()->web_contents(), about_blank_url);
     NavigateFrameToURL(root->child_at(0), about_blank_url);
 
     EXPECT_TRUE(observer.has_committed());
     EXPECT_FALSE(observer.is_error());
-    EXPECT_FALSE(observer.is_same_page());
+    EXPECT_FALSE(observer.is_same_document());
     EXPECT_EQ(about_blank_url, observer.last_committed_url());
   }
 }
 
 // Ensure that a NavigationThrottle can cancel the navigation at navigation
 // start.
 IN_PROC_BROWSER_TEST_F(NavigationHandleImplBrowserTest, ThrottleCancelStart) {
   GURL start_url(embedded_test_server()->GetURL("/title1.html"));
   EXPECT_TRUE(NavigateToURL(shell(), start_url));
 
@@ skipping 373 matching lines @@
   GURL start_url(
       embedded_test_server()->GetURL("/https_upgrade_cross_site.html"));
   GURL cross_site_iframe_secure_url("https://other.com/title1.html");
 
   CheckHttpsUpgradedIframeNavigation(start_url, cross_site_iframe_secure_url);
 }
 
 // Ensure that browser-initiated same-document navigations are detected and
 // don't issue network requests.  See crbug.com/663777.
 IN_PROC_BROWSER_TEST_F(NavigationHandleImplBrowserTest,
-                       SamePageBrowserInitiatedNoReload) {
+                       SameDocumentBrowserInitiatedNoReload) {
   GURL url(embedded_test_server()->GetURL("/title1.html"));
   GURL url_fragment_1(embedded_test_server()->GetURL("/title1.html#id_1"));
   GURL url_fragment_2(embedded_test_server()->GetURL("/title1.html#id_2"));
 
   // 1) Perform a new-document navigation.
   {
     TestNavigationThrottleInstaller installer(
         shell()->web_contents(), NavigationThrottle::PROCEED,
         NavigationThrottle::PROCEED, NavigationThrottle::PROCEED);
     NavigationHandleObserver observer(shell()->web_contents(), url);
     EXPECT_TRUE(NavigateToURL(shell(), url));
     EXPECT_EQ(1, installer.will_start_called());
     EXPECT_EQ(1, installer.will_process_called());
-    EXPECT_FALSE(observer.is_same_page());
+    EXPECT_FALSE(observer.is_same_document());
   }
 
   // 2) Perform a same-document navigation by adding a fragment.
   {
     TestNavigationThrottleInstaller installer(
         shell()->web_contents(), NavigationThrottle::PROCEED,
         NavigationThrottle::PROCEED, NavigationThrottle::PROCEED);
     NavigationHandleObserver observer(shell()->web_contents(), url_fragment_1);
     EXPECT_TRUE(NavigateToURL(shell(), url_fragment_1));
     EXPECT_EQ(0, installer.will_start_called());
     EXPECT_EQ(0, installer.will_process_called());
-    EXPECT_TRUE(observer.is_same_page());
+    EXPECT_TRUE(observer.is_same_document());
   }
 
   // 3) Perform a same-document navigation by modifying the fragment.
   {
     TestNavigationThrottleInstaller installer(
         shell()->web_contents(), NavigationThrottle::PROCEED,
         NavigationThrottle::PROCEED, NavigationThrottle::PROCEED);
     NavigationHandleObserver observer(shell()->web_contents(), url_fragment_2);
     EXPECT_TRUE(NavigateToURL(shell(), url_fragment_2));
     EXPECT_EQ(0, installer.will_start_called());
     EXPECT_EQ(0, installer.will_process_called());
-    EXPECT_TRUE(observer.is_same_page());
+    EXPECT_TRUE(observer.is_same_document());
   }
 
   // 4) Redo the last navigation, but this time it should trigger a reload.
   {
     TestNavigationThrottleInstaller installer(
         shell()->web_contents(), NavigationThrottle::PROCEED,
         NavigationThrottle::PROCEED, NavigationThrottle::PROCEED);
     NavigationHandleObserver observer(shell()->web_contents(), url_fragment_2);
     EXPECT_TRUE(NavigateToURL(shell(), url_fragment_2));
     EXPECT_EQ(1, installer.will_start_called());
     EXPECT_EQ(1, installer.will_process_called());
-    EXPECT_FALSE(observer.is_same_page());
+    EXPECT_FALSE(observer.is_same_document());
   }
 
   // 5) Perform a new-document navigation by removing the fragment.
   {
     TestNavigationThrottleInstaller installer(
         shell()->web_contents(), NavigationThrottle::PROCEED,
         NavigationThrottle::PROCEED, NavigationThrottle::PROCEED);
     NavigationHandleObserver observer(shell()->web_contents(), url);
     EXPECT_TRUE(NavigateToURL(shell(), url));
     EXPECT_EQ(1, installer.will_start_called());
     EXPECT_EQ(1, installer.will_process_called());
-    EXPECT_FALSE(observer.is_same_page());
+    EXPECT_FALSE(observer.is_same_document());
   }
 }
 
 }  // namespace content