chrome/browser/page_load_metrics/observers/core_page_load_metrics_observer_unittest.cc - Issue 2806863003: [Page Load Metrics] Structure PageLoadTiming.

Unified Diff: chrome/browser/page_load_metrics/observers/core_page_load_metrics_observer_unittest.cc

Issue 2806863003: [Page Load Metrics] Structure PageLoadTiming. (Closed)

Patch Set: rebase Created 3 years, 8 months 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

« no previous file with comments | « chrome/browser/page_load_metrics/observers/core_page_load_metrics_observer.cc ('k') | chrome/browser/page_load_metrics/observers/css_scanning_page_load_metrics_observer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/page_load_metrics/observers/core_page_load_metrics_observer_unittest.cc

diff --git a/chrome/browser/page_load_metrics/observers/core_page_load_metrics_observer_unittest.cc b/chrome/browser/page_load_metrics/observers/core_page_load_metrics_observer_unittest.cc

index 84501e03c35c3b57257d02b5686af17248634277..ac8a004ccd3304f38f952e58057366f9c8b0e6de 100644

--- a/chrome/browser/page_load_metrics/observers/core_page_load_metrics_observer_unittest.cc

+++ b/chrome/browser/page_load_metrics/observers/core_page_load_metrics_observer_unittest.cc

@@ -50,7 +50,7 @@ TEST_F(CorePageLoadMetricsObserverTest,

page_load_metrics::PageLoadTiming timing;

timing.navigation_start = base::Time::FromDoubleT(1);

- timing.first_layout = first_layout;

+ timing.document_timing.first_layout = first_layout;

PopulateRequiredTimingFields(&timing);

NavigateAndCommit(GURL(kDefaultTestUrl));

@@ -78,11 +78,12 @@ TEST_F(CorePageLoadMetricsObserverTest, SingleMetricAfterCommit) {

page_load_metrics::PageLoadTiming timing;

timing.navigation_start = base::Time::FromDoubleT(1);

- timing.first_layout = first_layout;

- timing.parse_start = parse_start;

- timing.parse_stop = parse_stop;

- timing.parse_blocked_on_script_load_duration = parse_script_load_duration;

- timing.parse_blocked_on_script_execution_duration =

+ timing.document_timing.first_layout = first_layout;

+ timing.parse_timing.parse_start = parse_start;

+ timing.parse_timing.parse_stop = parse_stop;

+ timing.parse_timing.parse_blocked_on_script_load_duration =

+ parse_script_load_duration;

+ timing.parse_timing.parse_blocked_on_script_execution_duration =

parse_script_exec_duration;

PopulateRequiredTimingFields(&timing);

@@ -124,11 +125,11 @@ TEST_F(CorePageLoadMetricsObserverTest, MultipleMetricsAfterCommits) {

page_load_metrics::PageLoadTiming timing;

timing.navigation_start = base::Time::FromDoubleT(1);

timing.response_start = response;

- timing.first_layout = first_layout_1;

- timing.first_text_paint = first_text_paint;

- timing.first_contentful_paint = first_contentful_paint;

- timing.dom_content_loaded_event_start = dom_content;

- timing.load_event_start = load;

+ timing.document_timing.first_layout = first_layout_1;

+ timing.paint_timing.first_text_paint = first_text_paint;

+ timing.paint_timing.first_contentful_paint = first_contentful_paint;

+ timing.document_timing.dom_content_loaded_event_start = dom_content;

+ timing.document_timing.load_event_start = load;

PopulateRequiredTimingFields(&timing);

NavigateAndCommit(GURL(kDefaultTestUrl));

@@ -144,7 +145,7 @@ TEST_F(CorePageLoadMetricsObserverTest, MultipleMetricsAfterCommits) {

page_load_metrics::PageLoadTiming timing2;

timing2.navigation_start = base::Time::FromDoubleT(200);

- timing2.first_layout = first_layout_2;

+ timing2.document_timing.first_layout = first_layout_2;

PopulateRequiredTimingFields(&timing2);

SimulateTimingUpdate(timing2);

@@ -180,7 +181,7 @@ TEST_F(CorePageLoadMetricsObserverTest, BackgroundDifferentHistogram) {

page_load_metrics::PageLoadTiming timing;

timing.navigation_start = base::Time::FromDoubleT(1);

- timing.first_layout = first_layout;

+ timing.document_timing.first_layout = first_layout;

PopulateRequiredTimingFields(&timing);

// Simulate "Open link in new tab."

@@ -214,13 +215,14 @@ TEST_F(CorePageLoadMetricsObserverTest, BackgroundDifferentHistogram) {

TEST_F(CorePageLoadMetricsObserverTest, OnlyBackgroundLaterEvents) {

page_load_metrics::PageLoadTiming timing;

timing.navigation_start = base::Time::FromDoubleT(1);

- timing.dom_content_loaded_event_start = base::TimeDelta::FromMicroseconds(1);

+ timing.document_timing.dom_content_loaded_event_start =

+ base::TimeDelta::FromMicroseconds(1);

PopulateRequiredTimingFields(&timing);

// Make sure first_text_paint hasn't been set (wasn't set by

// PopulateRequiredTimingFields), since we want to defer setting it until

// after backgrounding.

- ASSERT_FALSE(timing.first_text_paint);

+ ASSERT_FALSE(timing.paint_timing.first_text_paint);

NavigateAndCommit(GURL(kDefaultTestUrl));

SimulateTimingUpdate(timing);

@@ -228,7 +230,7 @@ TEST_F(CorePageLoadMetricsObserverTest, OnlyBackgroundLaterEvents) {

// Background the tab, then foreground it.

web_contents()->WasHidden();

web_contents()->WasShown();

- timing.first_text_paint = base::TimeDelta::FromSeconds(4);

+ timing.paint_timing.first_text_paint = base::TimeDelta::FromSeconds(4);

PopulateRequiredTimingFields(&timing);

SimulateTimingUpdate(timing);

@@ -242,12 +244,14 @@ TEST_F(CorePageLoadMetricsObserverTest, OnlyBackgroundLaterEvents) {

NavigateAndCommit(GURL(kDefaultTestUrl2));

if (page_load_metrics::WasStartedInForegroundOptionalEventInForeground(

- timing.dom_content_loaded_event_start, info)) {

+ timing.document_timing.dom_content_loaded_event_start, info)) {

histogram_tester().ExpectTotalCount(internal::kHistogramDomContentLoaded,

1);

histogram_tester().ExpectBucketCount(

internal::kHistogramDomContentLoaded,

- timing.dom_content_loaded_event_start.value().InMilliseconds(), 1);

+ timing.document_timing.dom_content_loaded_event_start.value()

+ .InMilliseconds(),

+ 1);

histogram_tester().ExpectTotalCount(

internal::kBackgroundHistogramDomContentLoaded, 0);

} else {

@@ -262,7 +266,7 @@ TEST_F(CorePageLoadMetricsObserverTest, OnlyBackgroundLaterEvents) {

internal::kBackgroundHistogramFirstTextPaint, 1);

histogram_tester().ExpectBucketCount(

internal::kBackgroundHistogramFirstTextPaint,

- timing.first_text_paint.value().InMilliseconds(), 1);

+ timing.paint_timing.first_text_paint.value().InMilliseconds(), 1);

histogram_tester().ExpectTotalCount(internal::kHistogramLoad, 0);

histogram_tester().ExpectTotalCount(internal::kHistogramFirstTextPaint, 0);

@@ -278,7 +282,7 @@ TEST_F(CorePageLoadMetricsObserverTest, DontBackgroundQuickerLoad) {

page_load_metrics::PageLoadTiming timing;

timing.navigation_start = base::Time::FromDoubleT(1);

- timing.first_layout = first_layout;

+ timing.document_timing.first_layout = first_layout;

PopulateRequiredTimingFields(&timing);

web_contents()->WasHidden();

@@ -355,7 +359,7 @@ TEST_F(CorePageLoadMetricsObserverTest, NoRappor) {

TEST_F(CorePageLoadMetricsObserverTest, RapporLongPageLoad) {

page_load_metrics::PageLoadTiming timing;

timing.navigation_start = base::Time::FromDoubleT(1);

- timing.first_contentful_paint = base::TimeDelta::FromSeconds(40);

+ timing.paint_timing.first_contentful_paint = base::TimeDelta::FromSeconds(40);

PopulateRequiredTimingFields(&timing);

NavigateAndCommit(GURL(kDefaultTestUrl));

SimulateTimingUpdate(timing);

@@ -378,7 +382,7 @@ TEST_F(CorePageLoadMetricsObserverTest, RapporLongPageLoad) {

TEST_F(CorePageLoadMetricsObserverTest, RapporQuickPageLoad) {

page_load_metrics::PageLoadTiming timing;

timing.navigation_start = base::Time::FromDoubleT(1);

- timing.first_contentful_paint = base::TimeDelta::FromSeconds(1);

+ timing.paint_timing.first_contentful_paint = base::TimeDelta::FromSeconds(1);

PopulateRequiredTimingFields(&timing);

NavigateAndCommit(GURL(kDefaultTestUrl));

@@ -402,8 +406,9 @@ TEST_F(CorePageLoadMetricsObserverTest, RapporQuickPageLoad) {

TEST_F(CorePageLoadMetricsObserverTest, Reload) {

page_load_metrics::PageLoadTiming timing;

timing.navigation_start = base::Time::FromDoubleT(1);

- timing.parse_start = base::TimeDelta::FromMilliseconds(5);

- timing.first_contentful_paint = base::TimeDelta::FromMilliseconds(10);

+ timing.parse_timing.parse_start = base::TimeDelta::FromMilliseconds(5);

+ timing.paint_timing.first_contentful_paint =

+ base::TimeDelta::FromMilliseconds(10);

PopulateRequiredTimingFields(&timing);

GURL url(kDefaultTestUrl);

@@ -438,7 +443,7 @@ TEST_F(CorePageLoadMetricsObserverTest, Reload) {

internal::kHistogramLoadTypeFirstContentfulPaintReload, 1);

histogram_tester().ExpectBucketCount(

internal::kHistogramLoadTypeFirstContentfulPaintReload,

- timing.first_contentful_paint.value().InMilliseconds(), 1);

+ timing.paint_timing.first_contentful_paint.value().InMilliseconds(), 1);

histogram_tester().ExpectTotalCount(

internal::kHistogramLoadTypeFirstContentfulPaintForwardBack, 0);

histogram_tester().ExpectTotalCount(

@@ -447,7 +452,7 @@ TEST_F(CorePageLoadMetricsObserverTest, Reload) {

internal::kHistogramLoadTypeParseStartReload, 1);

histogram_tester().ExpectBucketCount(

internal::kHistogramLoadTypeParseStartReload,

- timing.parse_start.value().InMilliseconds(), 1);

+ timing.parse_timing.parse_start.value().InMilliseconds(), 1);

histogram_tester().ExpectTotalCount(

internal::kHistogramLoadTypeParseStartForwardBack, 0);

histogram_tester().ExpectTotalCount(

@@ -481,8 +486,9 @@ TEST_F(CorePageLoadMetricsObserverTest, Reload) {

TEST_F(CorePageLoadMetricsObserverTest, ForwardBack) {

page_load_metrics::PageLoadTiming timing;

timing.navigation_start = base::Time::FromDoubleT(1);

- timing.parse_start = base::TimeDelta::FromMilliseconds(5);

- timing.first_contentful_paint = base::TimeDelta::FromMilliseconds(10);

+ timing.parse_timing.parse_start = base::TimeDelta::FromMilliseconds(5);

+ timing.paint_timing.first_contentful_paint =

+ base::TimeDelta::FromMilliseconds(10);

PopulateRequiredTimingFields(&timing);

GURL url(kDefaultTestUrl);

@@ -525,7 +531,7 @@ TEST_F(CorePageLoadMetricsObserverTest, ForwardBack) {

internal::kHistogramLoadTypeFirstContentfulPaintForwardBack, 1);

histogram_tester().ExpectBucketCount(

internal::kHistogramLoadTypeFirstContentfulPaintForwardBack,

- timing.first_contentful_paint.value().InMilliseconds(), 1);

+ timing.paint_timing.first_contentful_paint.value().InMilliseconds(), 1);

histogram_tester().ExpectTotalCount(

internal::kHistogramLoadTypeFirstContentfulPaintNewNavigation, 0);

histogram_tester().ExpectTotalCount(

@@ -534,7 +540,7 @@ TEST_F(CorePageLoadMetricsObserverTest, ForwardBack) {

internal::kHistogramLoadTypeParseStartForwardBack, 1);

histogram_tester().ExpectBucketCount(

internal::kHistogramLoadTypeParseStartForwardBack,

- timing.parse_start.value().InMilliseconds(), 1);

+ timing.parse_timing.parse_start.value().InMilliseconds(), 1);

histogram_tester().ExpectTotalCount(

internal::kHistogramLoadTypeParseStartNewNavigation, 0);

@@ -566,8 +572,9 @@ TEST_F(CorePageLoadMetricsObserverTest, ForwardBack) {

TEST_F(CorePageLoadMetricsObserverTest, NewNavigation) {

page_load_metrics::PageLoadTiming timing;

timing.navigation_start = base::Time::FromDoubleT(1);

- timing.parse_start = base::TimeDelta::FromMilliseconds(5);

- timing.first_contentful_paint = base::TimeDelta::FromMilliseconds(10);

+ timing.parse_timing.parse_start = base::TimeDelta::FromMilliseconds(5);

+ timing.paint_timing.first_contentful_paint =

+ base::TimeDelta::FromMilliseconds(10);

PopulateRequiredTimingFields(&timing);

GURL url(kDefaultTestUrl);

@@ -606,7 +613,7 @@ TEST_F(CorePageLoadMetricsObserverTest, NewNavigation) {

internal::kHistogramLoadTypeFirstContentfulPaintNewNavigation, 1);

histogram_tester().ExpectBucketCount(

internal::kHistogramLoadTypeFirstContentfulPaintNewNavigation,

- timing.first_contentful_paint.value().InMilliseconds(), 1);

+ timing.paint_timing.first_contentful_paint.value().InMilliseconds(), 1);

histogram_tester().ExpectTotalCount(

internal::kHistogramLoadTypeParseStartReload, 0);

histogram_tester().ExpectTotalCount(

@@ -615,7 +622,7 @@ TEST_F(CorePageLoadMetricsObserverTest, NewNavigation) {

internal::kHistogramLoadTypeParseStartNewNavigation, 1);

histogram_tester().ExpectBucketCount(

internal::kHistogramLoadTypeParseStartNewNavigation,

- timing.parse_start.value().InMilliseconds(), 1);

+ timing.parse_timing.parse_start.value().InMilliseconds(), 1);

histogram_tester().ExpectUniqueSample(

internal::kHistogramLoadTypeNetworkBytesNewNavigation,

@@ -659,8 +666,9 @@ TEST_F(CorePageLoadMetricsObserverTest, BytesAndResourcesCounted) {

TEST_F(CorePageLoadMetricsObserverTest, FirstMeaningfulPaint) {

page_load_metrics::PageLoadTiming timing;

timing.navigation_start = base::Time::FromDoubleT(1);

- timing.parse_start = base::TimeDelta::FromMilliseconds(5);

- timing.first_meaningful_paint = base::TimeDelta::FromMilliseconds(10);

+ timing.parse_timing.parse_start = base::TimeDelta::FromMilliseconds(5);

+ timing.paint_timing.first_meaningful_paint =

+ base::TimeDelta::FromMilliseconds(10);

PopulateRequiredTimingFields(&timing);

NavigateAndCommit(GURL(kDefaultTestUrl));

@@ -679,8 +687,8 @@ TEST_F(CorePageLoadMetricsObserverTest, FirstMeaningfulPaint) {

TEST_F(CorePageLoadMetricsObserverTest, FirstMeaningfulPaintAfterInteraction) {

page_load_metrics::PageLoadTiming timing;

timing.navigation_start = base::Time::FromDoubleT(1);

- timing.parse_start = base::TimeDelta::FromMilliseconds(5);

- timing.first_paint = base::TimeDelta::FromMilliseconds(10);

+ timing.parse_timing.parse_start = base::TimeDelta::FromMilliseconds(5);

+ timing.paint_timing.first_paint = base::TimeDelta::FromMilliseconds(10);

PopulateRequiredTimingFields(&timing);

NavigateAndCommit(GURL(kDefaultTestUrl));

@@ -691,7 +699,8 @@ TEST_F(CorePageLoadMetricsObserverTest, FirstMeaningfulPaintAfterInteraction) {

blink::WebInputEvent::kTimeStampForTesting);

SimulateInputEvent(mouse_event);

- timing.first_meaningful_paint = base::TimeDelta::FromMilliseconds(1000);

+ timing.paint_timing.first_meaningful_paint =

+ base::TimeDelta::FromMilliseconds(1000);

PopulateRequiredTimingFields(&timing);

SimulateTimingUpdate(timing);