| Index: chrome/browser/page_load_metrics/observers/amp_page_load_metrics_observer_unittest.cc
|
| diff --git a/chrome/browser/page_load_metrics/observers/amp_page_load_metrics_observer_unittest.cc b/chrome/browser/page_load_metrics/observers/amp_page_load_metrics_observer_unittest.cc
|
| index 6cb4241e5cb066e4bc363ed3a94f0b7d580f2c15..f5d8169438b074e64294e6a64ea0976b5387c739 100644
|
| --- a/chrome/browser/page_load_metrics/observers/amp_page_load_metrics_observer_unittest.cc
|
| +++ b/chrome/browser/page_load_metrics/observers/amp_page_load_metrics_observer_unittest.cc
|
| @@ -19,15 +19,16 @@ class AMPPageLoadMetricsObserverTest
|
| AMPPageLoadMetricsObserverTest() {}
|
|
|
| void ResetTest() {
|
| + page_load_metrics::InitPageLoadTimingForTest(&timing_);
|
| // 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_timing.parse_start = base::TimeDelta::FromSeconds(3);
|
| - timing_.paint_timing.first_contentful_paint =
|
| + timing_.parse_timing->parse_start = base::TimeDelta::FromSeconds(3);
|
| + timing_.paint_timing->first_contentful_paint =
|
| base::TimeDelta::FromSeconds(4);
|
| - 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_.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);
|
| PopulateRequiredTimingFields(&timing_);
|
| }
|
|
|
| @@ -44,23 +45,24 @@ class AMPPageLoadMetricsObserverTest
|
| ValidateHistogramsFor(
|
| "PageLoad.Clients.AMP.DocumentTiming."
|
| "NavigationToDOMContentLoadedEventFired",
|
| - view_type, timing_.document_timing.dom_content_loaded_event_start,
|
| + view_type, timing_.document_timing->dom_content_loaded_event_start,
|
| expect_histograms);
|
| ValidateHistogramsFor(
|
| "PageLoad.Clients.AMP.DocumentTiming.NavigationToFirstLayout",
|
| - view_type, timing_.document_timing.first_layout, expect_histograms);
|
| + view_type, timing_.document_timing->first_layout, expect_histograms);
|
| ValidateHistogramsFor(
|
| "PageLoad.Clients.AMP.DocumentTiming."
|
| "NavigationToLoadEventFired",
|
| - view_type, timing_.document_timing.load_event_start, expect_histograms);
|
| + view_type, timing_.document_timing->load_event_start,
|
| + expect_histograms);
|
| ValidateHistogramsFor(
|
| "PageLoad.Clients.AMP.PaintTiming."
|
| "NavigationToFirstContentfulPaint",
|
| - view_type, timing_.paint_timing.first_contentful_paint,
|
| + view_type, timing_.paint_timing->first_contentful_paint,
|
| expect_histograms);
|
| ValidateHistogramsFor(
|
| "PageLoad.Clients.AMP.ParseTiming.NavigationToParseStart", view_type,
|
| - timing_.parse_timing.parse_start, expect_histograms);
|
| + timing_.parse_timing->parse_start, expect_histograms);
|
| }
|
|
|
| void ValidateHistogramsFor(const std::string& histogram,
|
| @@ -93,7 +95,7 @@ class AMPPageLoadMetricsObserverTest
|
| }
|
|
|
| private:
|
| - page_load_metrics::PageLoadTiming timing_;
|
| + page_load_metrics::mojom::PageLoadTiming timing_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(AMPPageLoadMetricsObserverTest);
|
| };
|
|
|