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..59070e75b57d23dc72e43dea80eb0a3a3acf7159 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
@@ -36,7 +36,8 @@ const char kBGHistogramNameDomContent[] =
 const char kBGHistogramNameLoad[] =
     "PageLoad.Timing2.NavigationToLoadEventFired.BG";
 
-const char kHistogramNameEvents[] = "PageLoad.EventCounts";
+const char kProvisionalEvents[] = "PageLoad.Events.Provisional";
+const char kCommittedEvents[] = "PageLoad.Events.Committed";
 
 }  //  namespace
 
@@ -49,6 +50,8 @@ class MetricsWebContentsObserverTest
     RenderViewHostTestHarness::SetUp();
     observer_ = make_scoped_ptr(new MetricsWebContentsObserver(web_contents()));
     observer_->WasShown();
+    num_provisional_events_ = 0;
+    num_committed_events_ = 0;
   }
 
   void AssertNoHistogramsLogged() {
@@ -57,9 +60,29 @@ class MetricsWebContentsObserverTest
     histogram_tester_.ExpectTotalCount(kHistogramNameFirstLayout, 0);
   }
 
+  void CheckProvisionalEvent(ProvisionalLoadEvent event, int count) {
+    histogram_tester_.ExpectBucketCount(kProvisionalEvents, event, count);
+    num_provisional_events_ += count;
+  }
+
+  void CheckCommittedEvent(CommittedLoadEvent event, int count) {
+    histogram_tester_.ExpectBucketCount(kCommittedEvents, event, count);
+    num_committed_events_ += count;
+  }
+
+  void CheckTotalEvents() {
+    histogram_tester_.ExpectTotalCount(kProvisionalEvents,
+                                       num_provisional_events_);
+    histogram_tester_.ExpectTotalCount(kCommittedEvents, num_committed_events_);
+  }
+
  protected:
   base::HistogramTester histogram_tester_;
   scoped_ptr<MetricsWebContentsObserver> observer_;
+
+ private:
+  int num_provisional_events_;
+  int num_committed_events_;
 };
 
 TEST_F(MetricsWebContentsObserverTest, NoMetrics) {
@@ -349,15 +372,9 @@ TEST_F(MetricsWebContentsObserverTest, FailProvisionalLoad) {
                                       net::ERR_TIMED_OUT);
   rfh_tester->SimulateNavigationStop();
 
-  histogram_tester_.ExpectTotalCount(kHistogramNameEvents, 3);
-  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);
+  CheckProvisionalEvent(PROVISIONAL_LOAD_FAILED_NON_ABORT, 1);
+  CheckProvisionalEvent(PROVISIONAL_LOAD_ABORTED, 0);
+  CheckTotalEvents();
 }
 
 TEST_F(MetricsWebContentsObserverTest, AbortProvisionalLoad) {
@@ -370,15 +387,30 @@ TEST_F(MetricsWebContentsObserverTest, AbortProvisionalLoad) {
   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);
+  CheckProvisionalEvent(PROVISIONAL_LOAD_FAILED_NON_ABORT, 0);
+  CheckProvisionalEvent(PROVISIONAL_LOAD_ABORTED, 1);
+  CheckTotalEvents();
+}
+
+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));
+
+  CheckProvisionalEvent(PROVISIONAL_LOAD_COMMITTED, 2);
+  CheckCommittedEvent(COMMITTED_LOAD_STARTED_IN_FOREGROUND, 1);
+  CheckTotalEvents();
 }
 
 TEST_F(MetricsWebContentsObserverTest, AbortCommittedLoadBeforeFirstLayout) {
@@ -395,16 +427,13 @@ TEST_F(MetricsWebContentsObserverTest, AbortCommittedLoadBeforeFirstLayout) {
   // 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_.ExpectBucketCount(kHistogramNameEvents,
-                                      PAGE_LOAD_STARTED, 2);
-  histogram_tester_.ExpectBucketCount(
-      kHistogramNameEvents, PAGE_LOAD_ABORTED_BEFORE_FIRST_LAYOUT, 1);
+  CheckProvisionalEvent(PROVISIONAL_LOAD_COMMITTED, 2);
+  CheckCommittedEvent(COMMITTED_LOAD_STARTED_IN_FOREGROUND, 2);
+  CheckCommittedEvent(COMMITTED_LOAD_ABORTED_BEFORE_FIRST_LAYOUT, 1);
+  CheckTotalEvents();
 }
 
-TEST_F(MetricsWebContentsObserverTest,
-       SuccessfulFirstLayoutInForeGroundEvent) {
+TEST_F(MetricsWebContentsObserverTest, SuccessfulFirstLayoutInForegroundEvent) {
   PageLoadTiming timing;
   timing.navigation_start = base::Time::FromDoubleT(10);
   timing.first_layout = base::TimeDelta::FromMilliseconds(100);
@@ -419,12 +448,10 @@ TEST_F(MetricsWebContentsObserverTest,
   // Navigate again to force histogram logging.
   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_FOREGROUND, 1);
+  CheckProvisionalEvent(PROVISIONAL_LOAD_COMMITTED, 2);
+  CheckCommittedEvent(COMMITTED_LOAD_STARTED_IN_FOREGROUND, 2);
+  CheckCommittedEvent(COMMITTED_LOAD_SUCCESSFUL_FIRST_LAYOUT_FOREGROUND, 1);
+  CheckTotalEvents();
 }
 
 TEST_F(MetricsWebContentsObserverTest,
@@ -449,11 +476,33 @@ TEST_F(MetricsWebContentsObserverTest,
   // Navigate again to force histogram logging.
   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);
+  CheckProvisionalEvent(PROVISIONAL_LOAD_COMMITTED, 2);
+  CheckCommittedEvent(COMMITTED_LOAD_STARTED_IN_FOREGROUND, 2);
+  CheckCommittedEvent(COMMITTED_LOAD_SUCCESSFUL_FIRST_LAYOUT_BACKGROUND, 1);
+  CheckTotalEvents();
+}
+
+TEST_F(MetricsWebContentsObserverTest, BadIPC) {
+  PageLoadTiming timing;
+  timing.navigation_start = base::Time::FromDoubleT(10);
+  PageLoadTiming timing2;
+  timing2.navigation_start = base::Time::FromDoubleT(100);
+
+  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());
+  observer_->OnMessageReceived(
+      PageLoadMetricsMsg_TimingUpdated(observer_->routing_id(), timing2),
+      main_rfh());
+
+  CheckProvisionalEvent(PROVISIONAL_LOAD_COMMITTED, 1);
+  CheckCommittedEvent(COMMITTED_LOAD_STARTED_IN_FOREGROUND, 1);
+  CheckCommittedEvent(COMMITTED_LOAD_BAD_IPC, 1);
+  CheckTotalEvents();
 }
+
 }  // namespace page_load_metrics