Improve the TestNavigationManager

content/browser/site_per_process_browsertest.cc

Index: content/browser/site_per_process_browsertest.cc
diff --git a/content/browser/site_per_process_browsertest.cc b/content/browser/site_per_process_browsertest.cc
index df3ee7c607886cd4dbb2fc7f39aea1e8b8103648..00e365bd3e3389382f6b5c028a8ff59366b5eef1 100644
--- a/content/browser/site_per_process_browsertest.cc
+++ b/content/browser/site_per_process_browsertest.cc
@@ -7949,7 +7949,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,
   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 =
@@ -8011,7 +8011,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,
   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.
@@ -8318,7 +8318,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,
                                            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.
@@ -8328,7 +8328,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,
                                          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.