Rename is_same_page to is_same_document in NavigationHandle.

content/browser/frame_host/navigation_handle_impl.cc

 // Copyright 2015 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_handle_impl.h"
 
 #include <iterator>
 
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 46 matching lines @@
 }
 
 }  // namespace
 
 // static
 std::unique_ptr<NavigationHandleImpl> NavigationHandleImpl::Create(
     const GURL& url,
     const std::vector<GURL>& redirect_chain,
     FrameTreeNode* frame_tree_node,
     bool is_renderer_initiated,
-    bool is_same_page,
+    bool is_same_document,
     const base::TimeTicks& navigation_start,
     int pending_nav_entry_id,
     bool started_from_context_menu,
     CSPDisposition should_check_main_world_csp,
     bool is_form_submission) {
   return std::unique_ptr<NavigationHandleImpl>(new NavigationHandleImpl(
-      url, redirect_chain, frame_tree_node, is_renderer_initiated, is_same_page,
-      navigation_start, pending_nav_entry_id, started_from_context_menu,
-      should_check_main_world_csp, is_form_submission));
+      url, redirect_chain, frame_tree_node, is_renderer_initiated,
+      is_same_document, navigation_start, pending_nav_entry_id,
+      started_from_context_menu, should_check_main_world_csp,
+      is_form_submission));
 }
 
 NavigationHandleImpl::NavigationHandleImpl(
     const GURL& url,
     const std::vector<GURL>& redirect_chain,
     FrameTreeNode* frame_tree_node,
     bool is_renderer_initiated,
-    bool is_same_page,
+    bool is_same_document,
     const base::TimeTicks& navigation_start,
     int pending_nav_entry_id,
     bool started_from_context_menu,
     CSPDisposition should_check_main_world_csp,
     bool is_form_submission)
     : url_(url),
       has_user_gesture_(false),
       transition_(ui::PAGE_TRANSITION_LINK),
       is_external_protocol_(false),
       net_error_code_(net::OK),
       render_frame_host_(nullptr),
       is_renderer_initiated_(is_renderer_initiated),
-      is_same_page_(is_same_page),
+      is_same_document_(is_same_document),
       was_redirected_(false),
       did_replace_entry_(false),
       should_update_history_(false),
       subframe_entry_committed_(false),
       connection_info_(net::HttpResponseInfo::CONNECTION_INFO_UNKNOWN),
       original_url_(url),
       state_(INITIAL),
       is_transferring_(false),
       frame_tree_node_(frame_tree_node),
       next_index_(0),
@@ skipping 51 matching lines @@
 
   if (!IsRendererDebugURL(url_))
     GetDelegate()->DidStartNavigation(this);
 
   if (IsInMainFrame()) {
     TRACE_EVENT_ASYNC_BEGIN_WITH_TIMESTAMP1(
         "navigation", "Navigation StartToCommit", this,
         navigation_start, "Initial URL", url_.spec());
   }
 
-  if (is_same_page_) {
+  if (is_same_document_) {
     TRACE_EVENT_ASYNC_STEP_INTO0("navigation", "NavigationHandle", this,
                                  "Same document");
   }
 }
 
 NavigationHandleImpl::~NavigationHandleImpl() {
   // Inform the RenderProcessHost to no longer expect a navigation.
   if (expected_render_process_host_id_ != ChildProcessHost::kInvalidUniqueID) {
     RenderProcessHost* process =
         RenderProcessHost::FromID(expected_render_process_host_id_);
@@ skipping 117 matching lines @@
   // TODO(mkwst): Change this to check against 'READY_TO_COMMIT' once
   // ReadyToCommitNavigation is available whether or not PlzNavigate is
   // enabled. https://crbug.com/621856
   CHECK_GE(state_, WILL_PROCESS_RESPONSE)
       << "This accessor should only be called after a response has been "
          "delivered for processing.";
   return render_frame_host_;
 }
 
 bool NavigationHandleImpl::IsSameDocument() {
-  return is_same_page_;
+  return is_same_document_;
 }
 
 const net::HttpResponseHeaders* NavigationHandleImpl::GetResponseHeaders() {
   return response_headers_.get();
 }
 
 net::HttpResponseInfo::ConnectionInfo
 NavigationHandleImpl::GetConnectionInfo() {
   return connection_info_;
 }
@@ skipping 454 matching lines @@
     TRACE_EVENT_ASYNC_STEP_INTO0("navigation", "NavigationHandle", this,
                                  "DidCommitNavigation");
     state_ = DID_COMMIT;
 
     // Getting this far means that the navigation was not blocked, and neither
     // is this the error page navigation following a blocked navigation. Ensure
     // the frame owner element is no longer collapsed as a result of a prior
     // navigation having been blocked with BLOCK_REQUEST_AND_COLLAPSE.
     if (!frame_tree_node()->IsMainFrame()) {
       // The last committed load in collapsed frames will be an error page with
-      // |kUnreachableWebDataURL|. Same-page navigation should not be possible.
-      DCHECK(!is_same_page_ || !frame_tree_node()->is_collapsed());
+      // |kUnreachableWebDataURL|. Same-document navigation should not be
+      // possible.
+      DCHECK(!is_same_document_ || !frame_tree_node()->is_collapsed());
       frame_tree_node()->SetCollapsed(false);
     }
   }
 }
 
 void NavigationHandleImpl::SetExpectedProcess(
     RenderProcessHost* expected_process) {
   if (expected_process &&
       expected_process->GetID() == expected_render_process_host_id_) {
     // This |expected_process| has already been informed of the navigation,
@@ skipping 359 matching lines @@
   if (new_site_url == site_url_)
     return;
 
   // When redirecting cross-site, stop telling the speculative
   // RenderProcessHost to expect a navigation commit.
   SetExpectedProcess(nullptr);
   site_url_ = new_site_url;
 }
 
 }  // namespace content