Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(107)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/page_load_metrics/browser/metrics_web_contents_observer_unittest.cc

Issue 1417733011: page_load_metrics symbolic constants refactor (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@navigation_start_final
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/page_load_metrics/browser/metrics_web_contents_observer.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 b3bad6288a32ababebe112e23cb0f5c44e995279..769c2373c661db48d50fd35ac9c149b091200bb3 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
@@ -69,17 +69,18 @@ class MetricsWebContentsObserverTest
}
void AssertNoHistogramsLogged() {
- histogram_tester_.ExpectTotalCount(kHistogramNameDomContent, 0);
- histogram_tester_.ExpectTotalCount(kHistogramNameLoad, 0);
- histogram_tester_.ExpectTotalCount(kHistogramNameFirstLayout, 0);
- histogram_tester_.ExpectTotalCount(kHistogramNameFirstTextPaint, 0);
+ histogram_tester_.ExpectTotalCount(kHistogramDomContentLoaded, 0);
+ histogram_tester_.ExpectTotalCount(kHistogramLoad, 0);
+ histogram_tester_.ExpectTotalCount(kHistogramFirstLayout, 0);
+ histogram_tester_.ExpectTotalCount(kHistogramFirstTextPaint, 0);
}
void CheckProvisionalEvent(ProvisionalLoadEvent event,
int count,
bool background) {
if (background) {
- histogram_tester_.ExpectBucketCount(kBGProvisionalEvents, event, count);
+ histogram_tester_.ExpectBucketCount(kBackgroundProvisionalEvents, event,
+ count);
num_provisional_events_bg_ += count;
} else {
histogram_tester_.ExpectBucketCount(kProvisionalEvents, event, count);
@@ -91,7 +92,8 @@ class MetricsWebContentsObserverTest
int count,
bool background) {
if (background) {
- histogram_tester_.ExpectBucketCount(kBGCommittedEvents, event, count);
+ histogram_tester_.ExpectBucketCount(kBackgroundCommittedEvents, event,
+ count);
num_committed_events_bg_ += count;
} else {
histogram_tester_.ExpectBucketCount(kCommittedEvents, event, count);
@@ -108,9 +110,9 @@ class MetricsWebContentsObserverTest
histogram_tester_.ExpectTotalCount(kProvisionalEvents,
num_provisional_events_);
histogram_tester_.ExpectTotalCount(kCommittedEvents, num_committed_events_);
- histogram_tester_.ExpectTotalCount(kBGProvisionalEvents,
+ histogram_tester_.ExpectTotalCount(kBackgroundProvisionalEvents,
num_provisional_events_bg_);
- histogram_tester_.ExpectTotalCount(kBGCommittedEvents,
+ histogram_tester_.ExpectTotalCount(kBackgroundCommittedEvents,
num_committed_events_bg_);
histogram_tester_.ExpectTotalCount(kErrorEvents, num_errors_);
}
@@ -204,12 +206,12 @@ TEST_F(MetricsWebContentsObserverTest, SamePageNoTriggerUntilTrueNavCommit) {
// But we should keep the timing info and log it when we get another
// navigation.
web_contents_tester->NavigateAndCommit(GURL(kDefaultTestUrl2));
- histogram_tester_.ExpectTotalCount(kHistogramNameDomContent, 0);
- histogram_tester_.ExpectTotalCount(kHistogramNameLoad, 0);
- histogram_tester_.ExpectTotalCount(kHistogramNameFirstLayout, 1);
- histogram_tester_.ExpectBucketCount(kHistogramNameFirstLayout,
+ histogram_tester_.ExpectTotalCount(kHistogramDomContentLoaded, 0);
+ histogram_tester_.ExpectTotalCount(kHistogramLoad, 0);
+ histogram_tester_.ExpectTotalCount(kHistogramFirstLayout, 1);
+ histogram_tester_.ExpectBucketCount(kHistogramFirstLayout,
first_layout.InMilliseconds(), 1);
- histogram_tester_.ExpectTotalCount(kHistogramNameFirstTextPaint, 0);
+ histogram_tester_.ExpectTotalCount(kHistogramFirstTextPaint, 0);
}
TEST_F(MetricsWebContentsObserverTest, SingleMetricAfterCommit) {
@@ -232,12 +234,12 @@ TEST_F(MetricsWebContentsObserverTest, SingleMetricAfterCommit) {
// Navigate again to force histogram recording.
web_contents_tester->NavigateAndCommit(GURL(kDefaultTestUrl2));
- histogram_tester_.ExpectTotalCount(kHistogramNameDomContent, 0);
- histogram_tester_.ExpectTotalCount(kHistogramNameLoad, 0);
- histogram_tester_.ExpectTotalCount(kHistogramNameFirstLayout, 1);
- histogram_tester_.ExpectBucketCount(kHistogramNameFirstLayout,
+ histogram_tester_.ExpectTotalCount(kHistogramDomContentLoaded, 0);
+ histogram_tester_.ExpectTotalCount(kHistogramLoad, 0);
+ histogram_tester_.ExpectTotalCount(kHistogramFirstLayout, 1);
+ histogram_tester_.ExpectBucketCount(kHistogramFirstLayout,
first_layout.InMilliseconds(), 1);
- histogram_tester_.ExpectTotalCount(kHistogramNameFirstTextPaint, 0);
+ histogram_tester_.ExpectTotalCount(kHistogramFirstTextPaint, 0);
}
TEST_F(MetricsWebContentsObserverTest, MultipleMetricsAfterCommits) {
@@ -276,25 +278,24 @@ TEST_F(MetricsWebContentsObserverTest, MultipleMetricsAfterCommits) {
web_contents_tester->NavigateAndCommit(GURL(kDefaultTestUrl));
- histogram_tester_.ExpectBucketCount(kHistogramNameFirstLayout,
+ histogram_tester_.ExpectBucketCount(kHistogramFirstLayout,
first_layout_1.InMilliseconds(), 1);
- histogram_tester_.ExpectTotalCount(kHistogramNameFirstLayout, 2);
- histogram_tester_.ExpectBucketCount(kHistogramNameFirstLayout,
+ histogram_tester_.ExpectTotalCount(kHistogramFirstLayout, 2);
+ histogram_tester_.ExpectBucketCount(kHistogramFirstLayout,
first_layout_1.InMilliseconds(), 1);
- histogram_tester_.ExpectBucketCount(kHistogramNameFirstLayout,
+ histogram_tester_.ExpectBucketCount(kHistogramFirstLayout,
first_layout_2.InMilliseconds(), 1);
- histogram_tester_.ExpectTotalCount(kHistogramNameFirstTextPaint, 1);
- histogram_tester_.ExpectBucketCount(kHistogramNameFirstTextPaint,
+ histogram_tester_.ExpectTotalCount(kHistogramFirstTextPaint, 1);
+ histogram_tester_.ExpectBucketCount(kHistogramFirstTextPaint,
first_text_paint.InMilliseconds(), 1);
- histogram_tester_.ExpectTotalCount(kHistogramNameDomContent, 1);
- histogram_tester_.ExpectBucketCount(kHistogramNameDomContent,
+ histogram_tester_.ExpectTotalCount(kHistogramDomContentLoaded, 1);
+ histogram_tester_.ExpectBucketCount(kHistogramDomContentLoaded,
dom_content.InMilliseconds(), 1);
- histogram_tester_.ExpectTotalCount(kHistogramNameLoad, 1);
- histogram_tester_.ExpectBucketCount(kHistogramNameLoad, load.InMilliseconds(),
- 1);
+ histogram_tester_.ExpectTotalCount(kHistogramLoad, 1);
+ histogram_tester_.ExpectBucketCount(kHistogramLoad, load.InMilliseconds(), 1);
}
TEST_F(MetricsWebContentsObserverTest, BackgroundDifferentHistogram) {
@@ -323,17 +324,17 @@ TEST_F(MetricsWebContentsObserverTest, BackgroundDifferentHistogram) {
// Navigate again to force histogram recording.
web_contents_tester->NavigateAndCommit(GURL(kDefaultTestUrl2));
- histogram_tester_.ExpectTotalCount(kBGHistogramNameDomContent, 0);
- histogram_tester_.ExpectTotalCount(kBGHistogramNameLoad, 0);
- histogram_tester_.ExpectTotalCount(kBGHistogramNameFirstLayout, 1);
- histogram_tester_.ExpectBucketCount(kBGHistogramNameFirstLayout,
+ histogram_tester_.ExpectTotalCount(kBackgroundHistogramDomContentLoaded, 0);
+ histogram_tester_.ExpectTotalCount(kBackgroundHistogramLoad, 0);
+ histogram_tester_.ExpectTotalCount(kBackgroundHistogramFirstLayout, 1);
+ histogram_tester_.ExpectBucketCount(kBackgroundHistogramFirstLayout,
first_layout.InMilliseconds(), 1);
- histogram_tester_.ExpectTotalCount(kBGHistogramNameFirstTextPaint, 0);
+ histogram_tester_.ExpectTotalCount(kBackgroundHistogramFirstTextPaint, 0);
- histogram_tester_.ExpectTotalCount(kHistogramNameDomContent, 0);
- histogram_tester_.ExpectTotalCount(kHistogramNameLoad, 0);
- histogram_tester_.ExpectTotalCount(kHistogramNameFirstLayout, 0);
- histogram_tester_.ExpectTotalCount(kHistogramNameFirstTextPaint, 0);
+ histogram_tester_.ExpectTotalCount(kHistogramDomContentLoaded, 0);
+ histogram_tester_.ExpectTotalCount(kHistogramLoad, 0);
+ histogram_tester_.ExpectTotalCount(kHistogramFirstLayout, 0);
+ histogram_tester_.ExpectTotalCount(kHistogramFirstTextPaint, 0);
}
TEST_F(MetricsWebContentsObserverTest, DontLogPrerender) {
@@ -381,23 +382,23 @@ TEST_F(MetricsWebContentsObserverTest, OnlyBackgroundLaterEvents) {
// Navigate again to force histogram recording.
web_contents_tester->NavigateAndCommit(GURL(kDefaultTestUrl2));
- histogram_tester_.ExpectTotalCount(kBGHistogramNameDomContent, 0);
- histogram_tester_.ExpectTotalCount(kBGHistogramNameLoad, 0);
- histogram_tester_.ExpectTotalCount(kBGHistogramNameFirstLayout, 1);
- histogram_tester_.ExpectBucketCount(kBGHistogramNameFirstLayout,
+ histogram_tester_.ExpectTotalCount(kBackgroundHistogramDomContentLoaded, 0);
+ histogram_tester_.ExpectTotalCount(kBackgroundHistogramLoad, 0);
+ histogram_tester_.ExpectTotalCount(kBackgroundHistogramFirstLayout, 1);
+ histogram_tester_.ExpectBucketCount(kBackgroundHistogramFirstLayout,
timing.first_layout.InMilliseconds(), 1);
- histogram_tester_.ExpectTotalCount(kBGHistogramNameFirstTextPaint, 1);
- histogram_tester_.ExpectBucketCount(kBGHistogramNameFirstTextPaint,
+ histogram_tester_.ExpectTotalCount(kBackgroundHistogramFirstTextPaint, 1);
+ histogram_tester_.ExpectBucketCount(kBackgroundHistogramFirstTextPaint,
timing.first_text_paint.InMilliseconds(),
1);
- histogram_tester_.ExpectTotalCount(kHistogramNameDomContent, 1);
+ histogram_tester_.ExpectTotalCount(kHistogramDomContentLoaded, 1);
histogram_tester_.ExpectBucketCount(
- kHistogramNameDomContent,
+ kHistogramDomContentLoaded,
timing.dom_content_loaded_event_start.InMilliseconds(), 1);
- histogram_tester_.ExpectTotalCount(kHistogramNameLoad, 0);
- histogram_tester_.ExpectTotalCount(kHistogramNameFirstLayout, 0);
- histogram_tester_.ExpectTotalCount(kHistogramNameFirstTextPaint, 0);
+ histogram_tester_.ExpectTotalCount(kHistogramLoad, 0);
+ histogram_tester_.ExpectTotalCount(kHistogramFirstLayout, 0);
+ histogram_tester_.ExpectTotalCount(kHistogramFirstTextPaint, 0);
}
TEST_F(MetricsWebContentsObserverTest, DontBackgroundQuickerLoad) {
@@ -432,12 +433,12 @@ TEST_F(MetricsWebContentsObserverTest, DontBackgroundQuickerLoad) {
// Navigate again to see if the timing updated for a subframe message.
web_contents_tester->NavigateAndCommit(GURL(kDefaultTestUrl));
- histogram_tester_.ExpectTotalCount(kHistogramNameDomContent, 0);
- histogram_tester_.ExpectTotalCount(kHistogramNameLoad, 0);
- histogram_tester_.ExpectTotalCount(kHistogramNameFirstLayout, 1);
- histogram_tester_.ExpectBucketCount(kHistogramNameFirstLayout,
+ histogram_tester_.ExpectTotalCount(kHistogramDomContentLoaded, 0);
+ histogram_tester_.ExpectTotalCount(kHistogramLoad, 0);
+ histogram_tester_.ExpectTotalCount(kHistogramFirstLayout, 1);
+ histogram_tester_.ExpectBucketCount(kHistogramFirstLayout,
first_layout.InMilliseconds(), 1);
- histogram_tester_.ExpectTotalCount(kHistogramNameFirstTextPaint, 0);
+ histogram_tester_.ExpectTotalCount(kHistogramFirstTextPaint, 0);
}
TEST_F(MetricsWebContentsObserverTest, FailProvisionalLoad) {
« no previous file with comments | « components/page_load_metrics/browser/metrics_web_contents_observer.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698