[page_load_metrics] Add a NavigationThrottle for richer abort metrics

content/browser/frame_host/navigation_handle_impl_browsertest.cc

 // Copyright 2016 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/frame_host/navigation_handle_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/request_context_type.h"
 #include "content/public/test/browser_test_utils.h"
@@ skipping 677 matching lines @@
       shell()->web_contents(), NavigationThrottle::PROCEED,
       NavigationThrottle::PROCEED, NavigationThrottle::PROCEED);
   TestNavigationManager main_manager(shell()->web_contents(), main_url);
   TestNavigationManager b_manager(shell()->web_contents(), b_url);
   TestNavigationManager c_manager(shell()->web_contents(), c_url);
   NavigationStartUrlRecorder url_recorder(shell()->web_contents());
   TestNavigationThrottle* previous_throttle = nullptr;
 
   // Starts and verifies the main frame navigation.
   shell()->LoadURL(main_url);
-  main_manager.WaitForWillStartRequest();
+  EXPECT_TRUE(main_manager.WaitForWillStartRequest());
   // The throttle should not be null.
   EXPECT_NE(previous_throttle, installer.navigation_throttle());
   // Checks the only URL recorded so far is the one expected for the main frame.
   EXPECT_EQ(main_url, url_recorder.urls().back());
   EXPECT_EQ(1ul, url_recorder.urls().size());
   // Checks the main frame RequestContextType.
   EXPECT_EQ(REQUEST_CONTEXT_TYPE_LOCATION,
             installer.navigation_throttle()->request_context_type());
   // For each navigations the throttle should be a different instance.
   previous_throttle = installer.navigation_throttle();
 
   // Ditto for frame b navigation.
   main_manager.WaitForNavigationFinished();
-  b_manager.WaitForWillStartRequest();
+  EXPECT_TRUE(b_manager.WaitForWillStartRequest());
   EXPECT_NE(previous_throttle, installer.navigation_throttle());
   EXPECT_EQ(b_url, url_recorder.urls().back());
   EXPECT_EQ(2ul, url_recorder.urls().size());
   EXPECT_EQ(REQUEST_CONTEXT_TYPE_LOCATION,
             installer.navigation_throttle()->request_context_type());
   previous_throttle = installer.navigation_throttle();
 
   // Ditto for frame c navigation.
   b_manager.WaitForNavigationFinished();
-  c_manager.WaitForWillStartRequest();
+  EXPECT_TRUE(c_manager.WaitForWillStartRequest());
   EXPECT_NE(previous_throttle, installer.navigation_throttle());
   EXPECT_EQ(c_url, url_recorder.urls().back());
   EXPECT_EQ(3ul, url_recorder.urls().size());
   EXPECT_EQ(REQUEST_CONTEXT_TYPE_LOCATION,
             installer.navigation_throttle()->request_context_type());
 
   // Lets the final navigation finish so that we conclude running the
   // RequestContextType checks that happen in TestNavigationThrottle.
   c_manager.WaitForNavigationFinished();
   // Confirms the last navigation did finish.
@@ skipping 17 matching lines @@
   EXPECT_EQ(document_url, url_recorder.urls().back());
   EXPECT_EQ(1ul, url_recorder.urls().size());
 
   // Starts the navigation from a link click and then check it.
   EXPECT_TRUE(WaitForLoadStop(shell()->web_contents()));
   bool success = false;
   EXPECT_TRUE(ExecuteScriptAndExtractBool(
       shell(), "window.domAutomationController.send(clickSameSiteLink());",
       &success));
   EXPECT_TRUE(success);
-  link_manager.WaitForWillStartRequest();
+  EXPECT_TRUE(link_manager.WaitForWillStartRequest());
   EXPECT_EQ(link_url, url_recorder.urls().back());
   EXPECT_EQ(2ul, url_recorder.urls().size());
   EXPECT_EQ(REQUEST_CONTEXT_TYPE_HYPERLINK,
             installer.navigation_throttle()->request_context_type());
 
   // Finishes the last navigation.
   link_manager.WaitForNavigationFinished();
   EXPECT_FALSE(installer.navigation_throttle());
 }
 
@@ skipping 12 matching lines @@
 
   // Navigate to a page with a form.
   EXPECT_TRUE(NavigateToURL(shell(), document_url));
   EXPECT_EQ(document_url, url_recorder.urls().back());
   EXPECT_EQ(1ul, url_recorder.urls().size());
 
   // Executes the form POST navigation and then check it.
   EXPECT_TRUE(WaitForLoadStop(shell()->web_contents()));
   GURL submit_url("javascript:submitForm('isubmit')");
   shell()->LoadURL(submit_url);
-  post_manager.WaitForWillStartRequest();
+  EXPECT_TRUE(post_manager.WaitForWillStartRequest());
   EXPECT_EQ(post_url, url_recorder.urls().back());
   EXPECT_EQ(2ul, url_recorder.urls().size());
   EXPECT_EQ(REQUEST_CONTEXT_TYPE_FORM,
             installer.navigation_throttle()->request_context_type());
 
   // Finishes the last navigation.
   post_manager.WaitForNavigationFinished();
   EXPECT_FALSE(installer.navigation_throttle());
 }
 
@@ skipping 12 matching lines @@
         shell()->web_contents(), NavigationThrottle::PROCEED,
         NavigationThrottle::PROCEED, NavigationThrottle::PROCEED);
     TestNavigationManager navigation_manager(shell()->web_contents(),
                                              iframe_secure_url);
 
     // Load the page and wait for the frame load with the expected URL.
     // Note: if the test times out while waiting then a navigation to
     // iframe_secure_url never happened and the expected upgrade may not be
     // working.
     shell()->LoadURL(start_url);
-    navigation_manager.WaitForWillStartRequest();
+    EXPECT_TRUE(navigation_manager.WaitForWillStartRequest());
 
     // The main frame should have finished navigating while the iframe should
     // have just started.
     EXPECT_EQ(2, installer.will_start_called());
     EXPECT_EQ(0, installer.will_redirect_called());
     EXPECT_EQ(1, installer.will_process_called());
 
     // Check the correct start URLs have been registered.
     EXPECT_EQ(iframe_secure_url, url_recorder.urls().back());
     EXPECT_EQ(start_url, url_recorder.urls().front());
@@ skipping 21 matching lines @@
 IN_PROC_BROWSER_TEST_F(NavigationHandleImplHttpsUpgradeBrowserTest,
                        StartUrlIsHttpsUpgradedCrossSite) {
   GURL start_url(
       embedded_test_server()->GetURL("/https_upgrade_cross_site.html"));
   GURL cross_site_iframe_secure_url("https://other.com/title1.html");
 
   CheckHttpsUpgradedIframeNavigation(start_url, cross_site_iframe_secure_url);
 }
 
 }  // namespace content