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

Unified Diff: chrome/browser/page_load_metrics/observers/data_reduction_proxy_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/data_reduction_proxy_metrics_observer.cc ('k') | chrome/browser/page_load_metrics/observers/delay_navigation_page_load_metrics_observer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 81203cf40337ed57832837d3ae11a22398f300fb..a0fe3c6496c9ba39832d4d54c8a71e11e53feaac 100644

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

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

@@ -137,15 +137,17 @@ class DataReductionProxyMetricsObserverTest

// Reset to the default testing state. Does not reset histogram state.

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

timing_.response_start = base::TimeDelta::FromSeconds(2);

- timing_.parse_start = base::TimeDelta::FromSeconds(3);

- timing_.first_contentful_paint = base::TimeDelta::FromSeconds(4);

- timing_.first_paint = base::TimeDelta::FromSeconds(4);

- timing_.first_meaningful_paint = base::TimeDelta::FromSeconds(8);

- timing_.first_image_paint = base::TimeDelta::FromSeconds(5);

- timing_.first_text_paint = base::TimeDelta::FromSeconds(6);

- timing_.load_event_start = base::TimeDelta::FromSeconds(7);

- timing_.parse_stop = base::TimeDelta::FromSeconds(4);

- timing_.parse_blocked_on_script_load_duration =

+ timing_.parse_timing.parse_start = base::TimeDelta::FromSeconds(3);

+ timing_.paint_timing.first_contentful_paint =

+ base::TimeDelta::FromSeconds(4);

+ timing_.paint_timing.first_paint = base::TimeDelta::FromSeconds(4);

+ timing_.paint_timing.first_meaningful_paint =

+ base::TimeDelta::FromSeconds(8);

+ timing_.paint_timing.first_image_paint = base::TimeDelta::FromSeconds(5);

+ timing_.paint_timing.first_text_paint = base::TimeDelta::FromSeconds(6);

+ timing_.document_timing.load_event_start = base::TimeDelta::FromSeconds(7);

+ timing_.parse_timing.parse_stop = base::TimeDelta::FromSeconds(4);

+ timing_.parse_timing.parse_blocked_on_script_load_duration =

base::TimeDelta::FromSeconds(1);

PopulateRequiredTimingFields(&timing_);

}

@@ -180,45 +182,45 @@ class DataReductionProxyMetricsObserverTest

EXPECT_TRUE(pingback_client_->send_pingback_called());

EXPECT_EQ(timing_.navigation_start,

pingback_client_->timing()->navigation_start);

- ExpectEqualOrUnset(timing_.first_contentful_paint,

- pingback_client_->timing()->first_contentful_paint);

+ ExpectEqualOrUnset(timing_.paint_timing.first_contentful_paint,

+ pingback_client_->timing()->first_contentful_paint);

ExpectEqualOrUnset(

- timing_.first_meaningful_paint,

+ timing_.paint_timing.first_meaningful_paint,

pingback_client_->timing()->experimental_first_meaningful_paint);

ExpectEqualOrUnset(timing_.response_start,

pingback_client_->timing()->response_start);

- ExpectEqualOrUnset(timing_.load_event_start,

- pingback_client_->timing()->load_event_start);

- ExpectEqualOrUnset(timing_.first_image_paint,

- pingback_client_->timing()->first_image_paint);

+ ExpectEqualOrUnset(timing_.document_timing.load_event_start,

+ pingback_client_->timing()->load_event_start);

+ ExpectEqualOrUnset(timing_.paint_timing.first_image_paint,

+ pingback_client_->timing()->first_image_paint);

}

void ValidateHistograms() {

ValidateHistogramsForSuffix(

internal::kHistogramDOMContentLoadedEventFiredSuffix,

- timing_.dom_content_loaded_event_start);

+ timing_.document_timing.dom_content_loaded_event_start);

ValidateHistogramsForSuffix(internal::kHistogramFirstLayoutSuffix,

- timing_.first_layout);

+ timing_.document_timing.first_layout);

ValidateHistogramsForSuffix(internal::kHistogramLoadEventFiredSuffix,

- timing_.load_event_start);

+ timing_.document_timing.load_event_start);

ValidateHistogramsForSuffix(internal::kHistogramFirstContentfulPaintSuffix,

- timing_.first_contentful_paint);

+ timing_.paint_timing.first_contentful_paint);

ValidateHistogramsForSuffix(internal::kHistogramFirstMeaningfulPaintSuffix,

- timing_.first_meaningful_paint);

+ timing_.paint_timing.first_meaningful_paint);

ValidateHistogramsForSuffix(internal::kHistogramFirstImagePaintSuffix,

- timing_.first_image_paint);

+ timing_.paint_timing.first_image_paint);

ValidateHistogramsForSuffix(internal::kHistogramFirstPaintSuffix,

- timing_.first_paint);

+ timing_.paint_timing.first_paint);

ValidateHistogramsForSuffix(internal::kHistogramFirstTextPaintSuffix,

- timing_.first_text_paint);

+ timing_.paint_timing.first_text_paint);

ValidateHistogramsForSuffix(internal::kHistogramParseStartSuffix,

- timing_.parse_start);

+ timing_.parse_timing.parse_start);

ValidateHistogramsForSuffix(

internal::kHistogramParseBlockedOnScriptLoadSuffix,

- timing_.parse_blocked_on_script_load_duration);

- ValidateHistogramsForSuffix(

- internal::kHistogramParseDurationSuffix,

- timing_.parse_stop.value() - timing_.parse_start.value());

+ timing_.parse_timing.parse_blocked_on_script_load_duration);

+ ValidateHistogramsForSuffix(internal::kHistogramParseDurationSuffix,

+ timing_.parse_timing.parse_stop.value() -

+ timing_.parse_timing.parse_start.value());

}

void ValidateHistogramsForSuffix(

@@ -371,28 +373,28 @@ TEST_F(DataReductionProxyMetricsObserverTest, OnCompletePingback) {

ResetTest();

// Verify that when data reduction proxy was used but first image paint is

// unset, the correct timing information is sent to SendPingback.

- timing_.first_image_paint = base::nullopt;

+ timing_.paint_timing.first_image_paint = base::nullopt;

RunTestAndNavigateToUntrackedUrl(true, false);

ValidateTimes();

ResetTest();

// Verify that when data reduction proxy was used but first contentful paint

// is unset, SendPingback is not called.

- timing_.first_contentful_paint = base::nullopt;

+ timing_.paint_timing.first_contentful_paint = base::nullopt;

RunTestAndNavigateToUntrackedUrl(true, false);

ValidateTimes();

ResetTest();

// Verify that when data reduction proxy was used but first meaningful paint

// is unset, SendPingback is not called.

- timing_.first_meaningful_paint = base::nullopt;

+ timing_.paint_timing.first_meaningful_paint = base::nullopt;

RunTestAndNavigateToUntrackedUrl(true, false);

ValidateTimes();

ResetTest();

// Verify that when data reduction proxy was used but load event start is

// unset, SendPingback is not called.

- timing_.load_event_start = base::nullopt;

+ timing_.document_timing.load_event_start = base::nullopt;

RunTestAndNavigateToUntrackedUrl(true, false);

ValidateTimes();