Various cleanups for page_load_metrics_browsertest

* clean up and generalize PageLoadMetricsWaiter * where possible, switch tests from calling NavigateToUntrackedUrl() to using PageLoadMetricsWaiter * add support for monitoring both main and child frame updates * fix broken DocumentWriteAsync test BUG=720534 Review-Url: https://codereview.chromium.org/2868213003 Cr-Commit-Position: refs/heads/master@{#471005}

Various cleanups for page_load_metrics_browsertest
* clean up and generalize PageLoadMetricsWaiter * where possible, switch tests from calling NavigateToUntrackedUrl() to using PageLoadMetricsWaiter * add support for monitoring both main and child frame updates * fix broken DocumentWriteAsync test BUG=720534 Review-Url: https://codereview.chromium.org/2868213003 Cr-Commit-Position: refs/heads/master@{#471005}
a1692d2d · bmcquade · Commit bot · 43c5f351 · a1692d2d · a1692d2d
Commit a1692d2d authored May 11, 2017 by bmcquade Committed by Commit bot May 11, 2017
4 changed files
--- a/chrome/browser/page_load_metrics/metrics_web_contents_observer.cc
+++ b/chrome/browser/page_load_metrics/metrics_web_contents_observer.cc
@@ -607,7 +607,7 @@ void MetricsWebContentsObserver::OnTimingUpdated(
  committed_load_->UpdateTiming(timing, metadata);

  for (auto& observer : testing_observers_)
-    observer.OnTimingUpdated(timing, metadata);
+    observer.OnTimingUpdated(true /* is_main_frame */, timing, metadata);
 }

 bool MetricsWebContentsObserver::ShouldTrackNavigation(

--- a/chrome/browser/page_load_metrics/metrics_web_contents_observer.h
+++ b/chrome/browser/page_load_metrics/metrics_web_contents_observer.h
@@ -56,7 +56,8 @@ class MetricsWebContentsObserver
    void OnGoingAway();

    // Invoked when a new PageLoadTiming update has been received and processed.
-    virtual void OnTimingUpdated(const PageLoadTiming& timing,
+    virtual void OnTimingUpdated(bool is_main_frame,
+                                 const PageLoadTiming& timing,
                                 const PageLoadMetadata& metadata) {}

   private:

--- a/chrome/browser/page_load_metrics/page_load_metrics_browsertest.cc
+++ b/chrome/browser/page_load_metrics/page_load_metrics_browsertest.cc
--- a/chrome/test/data/page_load_metrics/document_write_async_script.html
+++ b/chrome/test/data/page_load_metrics/document_write_async_script.html
@@ -4,7 +4,7 @@
    var crossOrigin = 'http://localhost:8000';
    var filePath = "/page_load_metrics/empty.js";
    var src = crossOrigin + filePath;
-    document.write('<scr' + 'ipt src="' + src + ' async"></scr' + 'ipt>');
+    document.write('<scr' + 'ipt src="' + src + '" async></scr' + 'ipt>');
  })();
 </script>
 <body>