Page Abort Events for relevant navigations

components/page_load_metrics/browser/metrics_web_contents_observer_unittest.cc

Index: components/page_load_metrics/browser/metrics_web_contents_observer_unittest.cc
diff --git a/components/page_load_metrics/browser/metrics_web_contents_observer_unittest.cc b/components/page_load_metrics/browser/metrics_web_contents_observer_unittest.cc
index 147f09434028d069b3d59aaa0f0193f7d141c1e0..88ed6d867ad73446a191ba845cc816df3ea2c492 100644
--- a/components/page_load_metrics/browser/metrics_web_contents_observer_unittest.cc
+++ b/components/page_load_metrics/browser/metrics_web_contents_observer_unittest.cc
@@ -349,14 +349,12 @@ TEST_F(MetricsWebContentsObserverTest, FailProvisionalLoad) {
                                       net::ERR_TIMED_OUT);
   rfh_tester->SimulateNavigationStop();
 
-  histogram_tester_.ExpectTotalCount(kHistogramNameEvents, 3);
+  histogram_tester_.ExpectTotalCount(kHistogramNameEvents, 2);
   histogram_tester_.ExpectBucketCount(kHistogramNameEvents,
                                       PAGE_LOAD_STARTED, 1);
   histogram_tester_.ExpectBucketCount(kHistogramNameEvents,
                                       PAGE_LOAD_FAILED_BEFORE_COMMIT, 1);
   histogram_tester_.ExpectBucketCount(kHistogramNameEvents,
-                                      PAGE_LOAD_ABORTED_BEFORE_FIRST_LAYOUT, 1);
-  histogram_tester_.ExpectBucketCount(kHistogramNameEvents,
                                       PAGE_LOAD_ABORTED_BEFORE_COMMIT, 0);
 }
 
@@ -381,6 +379,27 @@ TEST_F(MetricsWebContentsObserverTest, AbortProvisionalLoad) {
                                       PAGE_LOAD_ABORTED_BEFORE_COMMIT, 1);
 }
 
+TEST_F(MetricsWebContentsObserverTest, DontLogIrrelevantNavigation) {
+  PageLoadTiming timing;
+  timing.navigation_start = base::Time::FromDoubleT(10);
+
+  content::WebContentsTester* web_contents_tester =
+      content::WebContentsTester::For(web_contents());
+
+  GURL about_blank_url = GURL("about:blank");
+  web_contents_tester->NavigateAndCommit(about_blank_url);
+
+  observer_->OnMessageReceived(
+      PageLoadMetricsMsg_TimingUpdated(observer_->routing_id(), timing),
+      main_rfh());
+
+  web_contents_tester->NavigateAndCommit(GURL(kDefaultTestUrl));
+
+  histogram_tester_.ExpectTotalCount(kHistogramNameEvents, 2);
+  histogram_tester_.ExpectBucketCount(kHistogramNameEvents,
+                                      PAGE_LOAD_STARTED, 2);
+}
+
 TEST_F(MetricsWebContentsObserverTest, AbortCommittedLoadBeforeFirstLayout) {
   PageLoadTiming timing;
   timing.navigation_start = base::Time::FromDoubleT(10);
@@ -396,11 +415,13 @@ TEST_F(MetricsWebContentsObserverTest, AbortCommittedLoadBeforeFirstLayout) {
   web_contents_tester->NavigateAndCommit(GURL(kDefaultTestUrl2));
 
   // 3 events: 2 starts and one abort before first layout.
-  histogram_tester_.ExpectTotalCount(kHistogramNameEvents, 3);
+  histogram_tester_.ExpectTotalCount(kHistogramNameEvents, 4);
   histogram_tester_.ExpectBucketCount(kHistogramNameEvents,
                                       PAGE_LOAD_STARTED, 2);
   histogram_tester_.ExpectBucketCount(
       kHistogramNameEvents, PAGE_LOAD_ABORTED_BEFORE_FIRST_LAYOUT, 1);
+  histogram_tester_.ExpectBucketCount(
+      kHistogramNameEvents, PAGE_LOAD_ABORTED_BEFORE_FIRST_LAYOUT_RELEVANT, 1);
 }
 
 TEST_F(MetricsWebContentsObserverTest,