Renamed WasWithinSamePage to WasWithinSameDocument.

content/public/test/navigation_simulator.cc

 // Copyright 2017 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/public/test/navigation_simulator.h"
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "content/browser/frame_host/navigation_handle_impl.h"
@@ skipping 281 matching lines @@
       !render_frame_host_->GetParent() ||
       render_frame_host_->frame_tree_node()->has_committed_real_load();
   params.gesture = NavigationGestureUser;
   params.contents_mime_type = "text/html";
   params.method = "GET";
   params.http_status_code = 200;
   params.socket_address.set_host("2001:db8::1");
   params.socket_address.set_port(80);
   params.history_list_was_cleared = false;
   params.original_request_url = navigation_url_;
-  params.was_within_same_page = false;
+  params.was_within_same_document = false;
   params.page_state =
       PageState::CreateForTesting(navigation_url_, false, nullptr, nullptr);
 
   render_frame_host_->SendNavigateWithParams(&params);
 
   // Simulate the UnloadACK in the old RenderFrameHost if it was swapped out at
   // commit time.
   if (previous_rfh != render_frame_host_) {
     previous_rfh->OnMessageReceived(
         FrameHostMsg_SwapOut_ACK(previous_rfh->GetRoutingID()));
@@ skipping 70 matching lines @@
 
   GURL error_url = GURL(kUnreachableWebDataURL);
   render_frame_host_->OnMessageReceived(FrameHostMsg_DidStartProvisionalLoad(
       render_frame_host_->GetRoutingID(), error_url, std::vector<GURL>(),
       base::TimeTicks::Now()));
   FrameHostMsg_DidCommitProvisionalLoad_Params params;
   params.nav_entry_id = 0;
   params.did_create_new_entry = true;
   params.url = navigation_url_;
   params.transition = transition_;
-  params.was_within_same_page = false;
+  params.was_within_same_document = false;
   params.url_is_unreachable = true;
   params.page_state =
       PageState::CreateForTesting(navigation_url_, false, nullptr, nullptr);
   render_frame_host_->SendNavigateWithParams(&params);
 
   // Simulate the UnloadACK in the old RenderFrameHost if it was swapped out at
   // commit time.
   if (previous_rfh != render_frame_host_) {
     previous_rfh->OnMessageReceived(
         FrameHostMsg_SwapOut_ACK(previous_rfh->GetRoutingID()));
   }
 
   state_ = FINISHED;
 
   CHECK_EQ(1, num_did_finish_navigation_called_);
 }
 
 void NavigationSimulator::CommitSamePage() {

[Charlie Reis, 2017/03/15 02:43:10]

Looks like there's only one caller of this.  Want to update it to
CommitSameDocument in this CL as well?

[Eugene But (OOO till 7-30), 2017/03/15 16:16:17]

Done.

   CHECK_EQ(INITIALIZATION, state_)
       << "NavigationSimulator::CommitErrorPage should be the only "
          "navigation event function called on the NavigationSimulator";
 
   render_frame_host_->OnMessageReceived(
       FrameHostMsg_DidStartLoading(render_frame_host_->GetRoutingID(), false));
 
   FrameHostMsg_DidCommitProvisionalLoad_Params params;
   params.nav_entry_id = 0;
   params.url = navigation_url_;
   params.origin = url::Origin(navigation_url_);
   params.transition = transition_;
   params.should_update_history = true;
   params.did_create_new_entry = false;
   params.gesture = NavigationGestureUser;
   params.contents_mime_type = "text/html";
   params.method = "GET";
   params.http_status_code = 200;
   params.socket_address.set_host("2001:db8::1");
   params.socket_address.set_port(80);
   params.history_list_was_cleared = false;
   params.original_request_url = navigation_url_;
-  params.was_within_same_page = true;
+  params.was_within_same_document = true;
   params.page_state =
       PageState::CreateForTesting(navigation_url_, false, nullptr, nullptr);
 
   render_frame_host_->SendNavigateWithParams(&params);
 
   render_frame_host_->OnMessageReceived(
       FrameHostMsg_DidStopLoading(render_frame_host_->GetRoutingID()));
 
   state_ = FINISHED;
 
@@ skipping 107 matching lines @@
 }
 
 void NavigationSimulator::PrepareCompleteCallbackOnHandle() {
   last_throttle_check_result_.reset();
   handle_->set_complete_callback_for_testing(
       base::Bind(&NavigationSimulator::OnThrottleChecksComplete,
                  weak_factory_.GetWeakPtr()));
 }
 
 }  // namespace content