Page Abort Events for relevant navigations

components/page_load_metrics/browser/metrics_web_contents_observer_unittest.cc

 // Copyright (c) 2015 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 "components/page_load_metrics/browser/metrics_web_contents_observer.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/process/kill.h"
 #include "base/test/histogram_tester.h"
 #include "base/time/time.h"
@@ skipping 331 matching lines @@
   content::WebContentsTester* web_contents_tester =
       content::WebContentsTester::For(web_contents());
 
   web_contents_tester->StartNavigation(GURL(kDefaultTestUrl));
   content::RenderFrameHostTester* rfh_tester =
       content::RenderFrameHostTester::For(main_rfh());
   rfh_tester->SimulateNavigationError(GURL(kDefaultTestUrl),
                                       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);
 }
 
 TEST_F(MetricsWebContentsObserverTest, AbortProvisionalLoad) {
   content::WebContentsTester* web_contents_tester =
       content::WebContentsTester::For(web_contents());
 
   web_contents_tester->StartNavigation(GURL(kDefaultTestUrl));
   content::RenderFrameHostTester* rfh_tester =
       content::RenderFrameHostTester::For(main_rfh());
   rfh_tester->SimulateNavigationError(GURL(kDefaultTestUrl), net::ERR_ABORTED);
   rfh_tester->SimulateNavigationStop();
 
   histogram_tester_.ExpectTotalCount(kHistogramNameEvents, 4);
   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, 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);
 
   content::WebContentsTester* web_contents_tester =
       content::WebContentsTester::For(web_contents());
   web_contents_tester->NavigateAndCommit(GURL(kDefaultTestUrl));
 
   observer_->OnMessageReceived(
       PageLoadMetricsMsg_TimingUpdated(observer_->routing_id(), timing),
       main_rfh());
   // Navigate again to force histogram logging.
   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,
        SuccessfulFirstLayoutInForeGroundEvent) {
   PageLoadTiming timing;
   timing.navigation_start = base::Time::FromDoubleT(10);
   timing.first_layout = base::TimeDelta::FromMilliseconds(100);
 
   content::WebContentsTester* web_contents_tester =
       content::WebContentsTester::For(web_contents());
@@ skipping 36 matching lines @@
   web_contents_tester->NavigateAndCommit(GURL(kDefaultTestUrl2));
 
   // 3 events: 2 starts and one successful first layout.
   histogram_tester_.ExpectTotalCount(kHistogramNameEvents, 3);
   histogram_tester_.ExpectBucketCount(kHistogramNameEvents,
                                       PAGE_LOAD_STARTED, 2);
   histogram_tester_.ExpectBucketCount(
       kHistogramNameEvents, PAGE_LOAD_SUCCESSFUL_FIRST_LAYOUT_BACKGROUND, 1);
 }
 }  // namespace page_load_metrics