| 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 7ab9d7ea98ee2605e3ce1651f69f6166e971d616..b4430653d1dd71da6f2f16c3c0cbd4d8d41ee270 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,22 +45,22 @@ class AMPPageLoadMetricsObserverTest
|
| ValidateHistogramsFor(
|
| "PageLoad.Clients.AMPCache2.DocumentTiming."
|
| "NavigationToDOMContentLoadedEventFired",
|
| - timing_.document_timing.dom_content_loaded_event_start,
|
| + timing_.document_timing->dom_content_loaded_event_start,
|
| expect_histograms);
|
| ValidateHistogramsFor(
|
| "PageLoad.Clients.AMPCache2.DocumentTiming.NavigationToFirstLayout",
|
| - timing_.document_timing.first_layout, expect_histograms);
|
| + timing_.document_timing->first_layout, expect_histograms);
|
| ValidateHistogramsFor(
|
| "PageLoad.Clients.AMPCache2.DocumentTiming."
|
| "NavigationToLoadEventFired",
|
| - timing_.document_timing.load_event_start, expect_histograms);
|
| + timing_.document_timing->load_event_start, expect_histograms);
|
| ValidateHistogramsFor(
|
| "PageLoad.Clients.AMPCache2.PaintTiming."
|
| "NavigationToFirstContentfulPaint",
|
| - timing_.paint_timing.first_contentful_paint, expect_histograms);
|
| + timing_.paint_timing->first_contentful_paint, expect_histograms);
|
| ValidateHistogramsFor(
|
| "PageLoad.Clients.AMPCache2.ParseTiming.NavigationToParseStart",
|
| - timing_.parse_timing.parse_start, expect_histograms);
|
| + timing_.parse_timing->parse_start, expect_histograms);
|
| }
|
|
|
| void ValidateHistogramsFor(const std::string& histogram_,
|
| @@ -80,7 +81,7 @@ class AMPPageLoadMetricsObserverTest
|
| }
|
|
|
| private:
|
| - page_load_metrics::PageLoadTiming timing_;
|
| + page_load_metrics::mojom::PageLoadTiming timing_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(AMPPageLoadMetricsObserverTest);
|
| };
|
|
|