Navigation: Removed deprecated error functions TestRenderFrameHost.

This patch removes deprecated methods
RenderFrameHostTester::SimulateNavigationError and
SimulateNavigationErrorPageCommit as well as their remaining uses
in unit tests.

Bug: 728571
Change-Id: I8f1d6b825cf80aad0680c3fd95a283897b19ebe8
Reviewed-on: https://chromium-review.googlesource.com/c/1370175Reviewed-by: Camille Lamy <clamy@chromium.org>
Commit-Queue: Arthur Hemery <ahemery@chromium.org>
Cr-Commit-Position: refs/heads/master@{#615508}

content/browser/frame_host/navigation_controller_impl_unittest.cc

@@ -456,13 +456,14 @@ TEST_F(NavigationControllerTestWithBrowserSideNavigation,
   NavigateAndCommit(initial_url);
 
   // Set the pending entry as url_1 and create the NavigationHandle.
-  controller.LoadURL(url_1, Referrer(), ui::PAGE_TRANSITION_TYPED,
-                     std::string());
+  auto navigation =
+      NavigationSimulator::CreateBrowserInitiated(url_1, contents());
+  navigation->Start();
   EXPECT_EQ(url_1, controller.GetVisibleEntry()->GetURL());
 
   // The navigation fails and needs to show an error page. This resets the
   // pending entry.
-  main_test_rfh()->SimulateNavigationError(url_1, net::ERR_TIMED_OUT);
+  navigation->Fail(net::ERR_TIMED_OUT);
   EXPECT_EQ(initial_url, controller.GetVisibleEntry()->GetURL());
 
   // A navigation to url_2 starts, creating a pending navigation entry.

content/browser/renderer_host/render_process_host_unittest.cc

@@ -456,9 +456,8 @@ TEST_F(RenderProcessHostUnitTest, DISABLED_ReuseNavigationProcess) {
   // RenderProcessHost with the REUSE_PENDING_OR_COMMITTED_SITE policy should
   // return the process of the speculative RenderFrameHost.
   navigation->Commit();
-  contents()->GetController().LoadURL(kUrl2, Referrer(),
-                                      ui::PAGE_TRANSITION_TYPED, std::string());
-  main_test_rfh()->SendBeforeUnloadACK(true);
+  navigation = NavigationSimulator::CreateBrowserInitiated(kUrl2, contents());
+  navigation->Start();
   site_instance = SiteInstanceImpl::CreateForURL(browser_context(), kUrl2);
   site_instance->set_process_reuse_policy(
       SiteInstanceImpl::ProcessReusePolicy::REUSE_PENDING_OR_COMMITTED_SITE);
@@ -470,8 +469,7 @@ TEST_F(RenderProcessHostUnitTest, DISABLED_ReuseNavigationProcess) {
   // no longer return the process of the speculative RenderFrameHost.
   int speculative_process_host_id =
       contents()->GetPendingMainFrame()->GetProcess()->GetID();
-  contents()->GetPendingMainFrame()->SimulateNavigationError(kUrl2,
-                                                             net::ERR_ABORTED);
+  navigation->Fail(net::ERR_ABORTED);
   site_instance = SiteInstanceImpl::CreateForURL(browser_context(), kUrl2);
   site_instance->set_process_reuse_policy(
       SiteInstanceImpl::ProcessReusePolicy::REUSE_PENDING_OR_COMMITTED_SITE);

content/test/test_render_frame_host.cc

@@ -183,51 +183,6 @@ void TestRenderFrameHost::SimulateNavigationCommit(const GURL& url) {
   SendNavigateWithParams(&params, was_within_same_document);
 }
 
-void TestRenderFrameHost::SimulateNavigationError(const GURL& url,
-                                                  int error_code) {
-  if (IsBrowserSideNavigationEnabled()) {
-    NavigationRequest* request = frame_tree_node_->navigation_request();
-    CHECK(request);
-    // Simulate a beforeUnload ACK from the renderer if the browser is waiting
-    // for it. If it runs it will update the request state.
-    if (request->state() == NavigationRequest::WAITING_FOR_RENDERER_RESPONSE) {
-      static_cast<TestRenderFrameHost*>(frame_tree_node()->current_frame_host())
-          ->SendBeforeUnloadACK(true);
-    }
-    if (!request->loader_for_testing()) {
-      base::RunLoop loop;
-      request->set_on_start_checks_complete_closure_for_testing(
-          loop.QuitClosure());
-      loop.Run();
-    }
-    TestNavigationURLLoader* url_loader =
-        static_cast<TestNavigationURLLoader*>(request->loader_for_testing());
-    CHECK(url_loader);
-    url_loader->SimulateError(error_code);
-    return;
-  }
-
-  FrameHostMsg_DidFailProvisionalLoadWithError_Params error_params;
-  error_params.error_code = error_code;
-  error_params.url = url;
-  OnDidFailProvisionalLoadWithError(error_params);
-}
-
-void TestRenderFrameHost::SimulateNavigationErrorPageCommit() {
-  CHECK(GetNavigationHandle());
-  GURL error_url = GURL(kUnreachableWebDataURL);
-  FrameHostMsg_DidCommitProvisionalLoad_Params params;
-  params.nav_entry_id = 0;
-  params.did_create_new_entry = true;
-  params.url = GetNavigationHandle()->GetURL();
-  params.transition = GetParent() ? ui::PAGE_TRANSITION_MANUAL_SUBFRAME
-                                  : ui::PAGE_TRANSITION_LINK;
-  params.url_is_unreachable = true;
-  params.page_state = PageState::CreateForTesting(
-      GetNavigationHandle()->GetURL(), false, nullptr, nullptr);
-  SendNavigateWithParams(&params, false /* was_within_same_document */);
-}
-
 void TestRenderFrameHost::SimulateNavigationStop() {
   if (is_loading()) {
     OnDidStopLoading();

content/test/test_render_frame_host.h

@@ -106,14 +106,6 @@ class TestRenderFrameHost : public RenderFrameHostImpl,
       service_manager::mojom::InterfaceProviderRequest request,
       bool was_within_same_document);
 
-  // Simulates a navigation to |url| failing with the error code |error_code|.
-  // DEPRECATED: use NavigationSimulator instead.
-  void SimulateNavigationError(const GURL& url, int error_code);
-
-  // Simulates the commit of an error page following a navigation failure.
-  // DEPRECATED: use NavigationSimulator instead.
-  void SimulateNavigationErrorPageCommit();
-
   // With the current navigation logic this method is a no-op.
   // Simulates a renderer-initiated navigation to |url| starting in the
   // RenderFrameHost.