Remove IsSynchronous API from NavigationHandle.

content/test/test_render_frame_host.cc

 // Copyright 2013 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/test/test_render_frame_host.h"
 
 #include "base/guid.h"
 #include "content/browser/frame_host/frame_tree.h"
 #include "content/browser/frame_host/navigation_handle_impl.h"
 #include "content/browser/frame_host/navigation_request.h"
@@ skipping 46 matching lines @@
                           render_view_host,
                           delegate,
                           rwh_delegate,
                           frame_tree,
                           frame_tree_node,
                           routing_id,
                           widget_routing_id,
                           flags),
       child_creation_observer_(delegate ? delegate->GetAsWebContents() : NULL),
       contents_mime_type_("text/html"),
-      simulate_history_list_was_cleared_(false) {}
+      simulate_history_list_was_cleared_(false),
+      last_commit_was_error_page_(false) {}
 
 TestRenderFrameHost::~TestRenderFrameHost() {
 }
 
 TestRenderViewHost* TestRenderFrameHost::GetRenderViewHost() {
   return static_cast<TestRenderViewHost*>(
       RenderFrameHostImpl::GetRenderViewHost());
 }
 
 MockRenderProcessHost* TestRenderFrameHost::GetProcess() {
@@ skipping 71 matching lines @@
   params.contents_mime_type = contents_mime_type_;
   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 = simulate_history_list_was_cleared_;
   params.original_request_url = url;
 
   url::Replacements<char> replacements;
   replacements.ClearRef();
+
+  // This approach to determining whether a navigation is to be treated as
+  // same page is not robust, as it will not handle pushState type navigation.
+  // Do not use elsewhere!
   params.was_within_same_page =
-      url.ReplaceComponents(replacements) ==
-      GetLastCommittedURL().ReplaceComponents(replacements);
+      (GetLastCommittedURL().is_valid() && !last_commit_was_error_page_ &&
+       url.ReplaceComponents(replacements) ==
+           GetLastCommittedURL().ReplaceComponents(replacements));
 
   params.page_state = PageState::CreateForTesting(url, false, nullptr, nullptr);
 
   SendNavigateWithParams(&params);
 }
 
 void TestRenderFrameHost::SimulateNavigationError(const GURL& url,
                                                   int error_code) {
   if (IsBrowserSideNavigationEnabled()) {
     NavigationRequest* request = frame_tree_node_->navigation_request();
@@ skipping 171 matching lines @@
   }
 
   // In most cases, the origin will match the URL's origin.  Tests that need to
   // check corner cases (like about:blank) should specify the origin param
   // manually.
   url::Origin origin(url_copy);
   params.origin = origin;
 
   url::Replacements<char> replacements;
   replacements.ClearRef();
+
+  // This approach to determining whether a navigation is to be treated as
+  // same page is not robust, as it will not handle pushState type navigation.
+  // Do not use elsewhere!
   params.was_within_same_page =
       !ui::PageTransitionCoreTypeIs(transition, ui::PAGE_TRANSITION_RELOAD) &&
       !ui::PageTransitionCoreTypeIs(transition, ui::PAGE_TRANSITION_TYPED) &&
-      url_copy.ReplaceComponents(replacements) ==
-          GetLastCommittedURL().ReplaceComponents(replacements);
+      (GetLastCommittedURL().is_valid() && !last_commit_was_error_page_ &&
+       url_copy.ReplaceComponents(replacements) ==
+           GetLastCommittedURL().ReplaceComponents(replacements));
 
   params.page_state =
       PageState::CreateForTesting(url_copy, false, nullptr, nullptr);
 
   if (!callback.is_null())
     callback.Run(&params);
 
   SendNavigateWithParams(&params);
 }
 
 void TestRenderFrameHost::SendNavigateWithParams(
     FrameHostMsg_DidCommitProvisionalLoad_Params* params) {
   FrameHostMsg_DidCommitProvisionalLoad msg(GetRoutingID(), *params);
   OnDidCommitProvisionalLoad(msg);
+  last_commit_was_error_page_ = params->url_is_unreachable;
 }
 
 void TestRenderFrameHost::SendRendererInitiatedNavigationRequest(
     const GURL& url,
     bool has_user_gesture) {
   // Since this is renderer-initiated navigation, the RenderFrame must be
   // initialized. Do it if it hasn't happened yet.
   InitializeRenderFrameIfNeeded();
 
   if (IsBrowserSideNavigationEnabled()) {
@@ skipping 83 matching lines @@
   // PlzNavigate: NavigationHandle::WillStartRequest has already been called at
   // this point.
   if (!navigation_handle() || IsBrowserSideNavigationEnabled())
     return;
   navigation_handle()->CallWillStartRequestForTesting(
       false /* is_post */, Referrer(GURL(), blink::WebReferrerPolicyDefault),
       true /* user_gesture */, transition, false /* is_external_protocol */);
 }
 
 }  // namespace content