Improve the TestNavigationManager

content/browser/site_per_process_browsertest.cc

 // Copyright (c) 2012 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/site_per_process_browsertest.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 7931 matching lines @@
   // The RenderViewHost for b.com in the main tab should not be active.
   SiteInstance* b_instance = popup_shell->web_contents()->GetSiteInstance();
   RenderViewHostImpl* rvh =
       web_contents()->GetFrameTree()->GetRenderViewHost(b_instance);
   EXPECT_FALSE(rvh->is_active());
 
   // Navigate main tab to a b.com URL that will not commit.
   GURL stall_url(embedded_test_server()->GetURL("b.com", "/title2.html"));
   TestNavigationManager delayer(shell()->web_contents(), stall_url);
   shell()->LoadURL(stall_url);
-  EXPECT_TRUE(delayer.WaitForWillStartRequest());
+  EXPECT_TRUE(delayer.WaitForRequestStart());
 
   // The pending RFH should be in the same process as the popup.
   RenderFrameHostImpl* pending_rfh =
       IsBrowserSideNavigationEnabled()
           ? root->render_manager()->speculative_frame_host()
           : root->render_manager()->pending_frame_host();
   RenderProcessHost* pending_process = pending_rfh->GetProcess();
   EXPECT_EQ(pending_process,
             popup_shell->web_contents()->GetMainFrame()->GetProcess());
 
@@ skipping 41 matching lines @@
   // The RenderViewHost for b.com in the main tab should not be active.
   SiteInstance* b_instance = popup_shell->web_contents()->GetSiteInstance();
   RenderViewHostImpl* rvh =
       web_contents()->GetFrameTree()->GetRenderViewHost(b_instance);
   EXPECT_FALSE(rvh->is_active());
 
   // Navigate main tab to a b.com URL that will not commit.
   GURL stall_url(embedded_test_server()->GetURL("b.com", "/title2.html"));
   TestNavigationManager delayer(shell()->web_contents(), stall_url);
   shell()->LoadURL(stall_url);
-  EXPECT_TRUE(delayer.WaitForWillStartRequest());
+  EXPECT_TRUE(delayer.WaitForRequestStart());
 
   // Kill the b.com process, currently in use by the pending RenderFrameHost
   // and the popup.
   RenderProcessHost* pending_process =
       popup_shell->web_contents()->GetMainFrame()->GetProcess();
   RenderProcessHostWatcher crash_observer(
       pending_process, RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT);
   EXPECT_TRUE(pending_process->Shutdown(0, false));
   crash_observer.Wait();
 
@@ skipping 286 matching lines @@
                             ->GetFrameTree()
                             ->root();
 
   // Start a cross-process navigation and wait until the response is received.
   GURL cross_site_url_1 =
       embedded_test_server()->GetURL("b.com", "/title1.html");
   TestNavigationManager cross_site_manager(shell()->web_contents(),
                                            cross_site_url_1);
   shell()->web_contents()->GetController().LoadURL(
       cross_site_url_1, Referrer(), ui::PAGE_TRANSITION_LINK, std::string());
-  EXPECT_TRUE(cross_site_manager.WaitForWillProcessResponse());
+  EXPECT_TRUE(cross_site_manager.WaitForResponse());
 
   // Start a renderer-initiated navigation to a cross-process url and make sure
   // the navigation will be blocked before being transferred.
   GURL cross_site_url_2 =
       embedded_test_server()->GetURL("c.com", "/title1.html");
   TestNavigationManager transfer_manager(shell()->web_contents(),
                                          cross_site_url_2);
   EXPECT_TRUE(ExecuteScript(
       root, "location.href = '" + cross_site_url_2.spec() + "';"));
-  EXPECT_TRUE(transfer_manager.WaitForWillProcessResponse());
+  EXPECT_TRUE(transfer_manager.WaitForResponse());
 
   // Now have the cross-process navigation commit and mark the current RFH as
   // pending deletion.
   cross_site_manager.WaitForNavigationFinished();
 
   // Resume the navigation in the previous RFH that has just been marked as
   // pending deletion. We should not crash.
   transfer_manager.WaitForNavigationFinished();
 }
 
 }  // namespace content