| Index: chrome/browser/prerender/prerender_browsertest.cc
|
| diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc
|
| index 3fb3cf44336a173d24de353b9eeebf7f1ae89186..448f060c3820393254e94247fd22516680d13c16 100644
|
| --- a/chrome/browser/prerender/prerender_browsertest.cc
|
| +++ b/chrome/browser/prerender/prerender_browsertest.cc
|
| @@ -3434,9 +3434,10 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, FirstContentfulPaintTimingSimple) {
|
| GetActiveWebContents());
|
| observer.SetNavigationStartTicksForTesting(load_start);
|
|
|
| - page_load_metrics::PageLoadTiming timing;
|
| + page_load_metrics::mojom::PageLoadTiming timing;
|
| + page_load_metrics::InitPageLoadTimingForTest(&timing);
|
| timing.navigation_start = base::Time::FromDoubleT(1); // Non-null time.
|
| - timing.paint_timing.first_contentful_paint =
|
| + timing.paint_timing->first_contentful_paint =
|
| base::TimeDelta::FromMilliseconds(2654);
|
| page_load_metrics::PageLoadMetricsObserverTestHarness::
|
| PopulateRequiredTimingFields(&timing);
|
| @@ -3475,9 +3476,10 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, FirstContentfulPaintTimingReuse) {
|
| GetActiveWebContents());
|
| observer.SetNavigationStartTicksForTesting(load_start);
|
|
|
| - page_load_metrics::PageLoadTiming timing;
|
| + page_load_metrics::mojom::PageLoadTiming timing;
|
| + page_load_metrics::InitPageLoadTimingForTest(&timing);
|
| timing.navigation_start = base::Time::FromDoubleT(1); // Non-null time.
|
| - timing.paint_timing.first_contentful_paint =
|
| + timing.paint_timing->first_contentful_paint =
|
| base::TimeDelta::FromMilliseconds(2361);
|
| page_load_metrics::PageLoadMetricsObserverTestHarness::
|
| PopulateRequiredTimingFields(&timing);
|
| @@ -3516,9 +3518,10 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
|
| GetActiveWebContents());
|
| observer.SetNavigationStartTicksForTesting(load_start);
|
|
|
| - page_load_metrics::PageLoadTiming timing;
|
| + page_load_metrics::mojom::PageLoadTiming timing;
|
| + page_load_metrics::InitPageLoadTimingForTest(&timing);
|
| timing.navigation_start = base::Time::FromDoubleT(1); // Non-null time.
|
| - timing.paint_timing.first_contentful_paint =
|
| + timing.paint_timing->first_contentful_paint =
|
| base::TimeDelta::FromMilliseconds(2361);
|
| page_load_metrics::PageLoadMetricsObserverTestHarness::
|
| PopulateRequiredTimingFields(&timing);
|
| @@ -3559,9 +3562,10 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
|
| GetActiveWebContents());
|
| observer.SetNavigationStartTicksForTesting(clock->NowTicks());
|
|
|
| - page_load_metrics::PageLoadTiming timing;
|
| + page_load_metrics::mojom::PageLoadTiming timing;
|
| + page_load_metrics::InitPageLoadTimingForTest(&timing);
|
| timing.navigation_start = base::Time::FromDoubleT(1); // Non-null time.
|
| - timing.paint_timing.first_contentful_paint =
|
| + timing.paint_timing->first_contentful_paint =
|
| base::TimeDelta::FromMilliseconds(2362);
|
| page_load_metrics::PageLoadMetricsObserverTestHarness::
|
| PopulateRequiredTimingFields(&timing);
|
| @@ -3608,10 +3612,11 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
|
| GetActiveWebContents());
|
| observer.SetNavigationStartTicksForTesting(load_start);
|
|
|
| - page_load_metrics::PageLoadTiming timing;
|
| + page_load_metrics::mojom::PageLoadTiming timing;
|
| + page_load_metrics::InitPageLoadTimingForTest(&timing);
|
| timing.navigation_start = base::Time::FromDoubleT(1); // Non-null time.
|
| // The FCP time should end up on the edge of the bucket.
|
| - timing.paint_timing.first_contentful_paint =
|
| + timing.paint_timing->first_contentful_paint =
|
| base::TimeDelta::FromMilliseconds(2654);
|
| page_load_metrics::PageLoadMetricsObserverTestHarness::
|
| PopulateRequiredTimingFields(&timing);
|
| @@ -3637,12 +3642,13 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, FirstContentfulPaintHidden) {
|
| observer.SetNavigationStartTicksForTesting(load_start);
|
|
|
| EXPECT_EQ(page_load_metrics::PageLoadMetricsObserver::CONTINUE_OBSERVING,
|
| - observer.OnHidden(page_load_metrics::PageLoadTiming(),
|
| + observer.OnHidden(page_load_metrics::mojom::PageLoadTiming(),
|
| GenericPageLoadExtraInfo(dest_url())));
|
|
|
| - page_load_metrics::PageLoadTiming timing;
|
| + page_load_metrics::mojom::PageLoadTiming timing;
|
| + page_load_metrics::InitPageLoadTimingForTest(&timing);
|
| timing.navigation_start = base::Time::FromDoubleT(1); // Non-null time.
|
| - timing.paint_timing.first_contentful_paint =
|
| + timing.paint_timing->first_contentful_paint =
|
| base::TimeDelta::FromMilliseconds(2654);
|
| page_load_metrics::PageLoadMetricsObserverTestHarness::
|
| PopulateRequiredTimingFields(&timing);
|
| @@ -3682,12 +3688,13 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
|
| observer.SetNavigationStartTicksForTesting(clock->NowTicks());
|
|
|
| EXPECT_EQ(page_load_metrics::PageLoadMetricsObserver::CONTINUE_OBSERVING,
|
| - observer.OnHidden(page_load_metrics::PageLoadTiming(),
|
| + observer.OnHidden(page_load_metrics::mojom::PageLoadTiming(),
|
| GenericPageLoadExtraInfo(dest_url())));
|
|
|
| - page_load_metrics::PageLoadTiming timing;
|
| + page_load_metrics::mojom::PageLoadTiming timing;
|
| + page_load_metrics::InitPageLoadTimingForTest(&timing);
|
| timing.navigation_start = base::Time::FromDoubleT(1); // Non-null time.
|
| - timing.paint_timing.first_contentful_paint =
|
| + timing.paint_timing->first_contentful_paint =
|
| base::TimeDelta::FromMilliseconds(2362);
|
| page_load_metrics::PageLoadMetricsObserverTestHarness::
|
| PopulateRequiredTimingFields(&timing);
|
|
|