[page_load_metrics] Add a NavigationThrottle for richer abort metrics

content/browser/frame_host/navigation_controller_impl_browsertest.cc

Index: content/browser/frame_host/navigation_controller_impl_browsertest.cc
diff --git a/content/browser/frame_host/navigation_controller_impl_browsertest.cc b/content/browser/frame_host/navigation_controller_impl_browsertest.cc
index c49846cf376a6df6dada3efe4bbb8b171a98bf92..8dd57493e8f1a64c9ade0829cc03fa9df97311ff 100644
--- a/content/browser/frame_host/navigation_controller_impl_browsertest.cc
+++ b/content/browser/frame_host/navigation_controller_impl_browsertest.cc
@@ -1868,7 +1868,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
                          "document.body.appendChild(iframe);";
     EXPECT_TRUE(ExecuteScript(root, script));
   }
-  subframe_delayer.WaitForWillStartRequest();
+  EXPECT_TRUE(subframe_delayer.WaitForWillStartRequest());
 
   // Stop the request so that we can wait for load stop below, without ending up
   // with a commit for this frame.
@@ -4059,7 +4059,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
   // second page, though, causes it to do a replaceState().
   TestNavigationManager manager(shell()->web_contents(), start_url);
   controller.GoBack();
-  manager.WaitForWillStartRequest();
+  EXPECT_TRUE(manager.WaitForWillStartRequest());
 
   // The navigation that just happened was the replaceState(), which should not
   // have changed the position into the navigation entry list. Make sure that
@@ -4977,14 +4977,14 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
   // Go forward two times in a row, being careful that the subframe commits
   // after the second forward navigation begins but before the main frame
   // commits.
-  TestNavigationManager subframe_delayer(
+  PerFrameTestNavigationManager subframe_delayer(
       root->child_at(0)->frame_tree_node_id(), shell()->web_contents(),
       frame_url_a2);
   TestNavigationManager mainframe_delayer(shell()->web_contents(), url_b);
   controller.GoForward();
-  subframe_delayer.WaitForWillStartRequest();
+  EXPECT_TRUE(subframe_delayer.WaitForWillStartRequest());
   controller.GoForward();
-  mainframe_delayer.WaitForWillStartRequest();
+  EXPECT_TRUE(mainframe_delayer.WaitForWillStartRequest());
   EXPECT_EQ(2, controller.GetPendingEntryIndex());
 
   // Let the subframe commit.
@@ -5027,7 +5027,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
   TestNavigationManager delayer(shell()->web_contents(),
                                 embedded_test_server()->GetURL("/title3.html"));
   shell()->LoadURL(embedded_test_server()->GetURL("/title3.html"));
-  delayer.WaitForWillStartRequest();
+  EXPECT_TRUE(delayer.WaitForWillStartRequest());
 
   NavigationController& controller = shell()->web_contents()->GetController();