Index: chrome/browser/prerender/prerender_browsertest.cc |
diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc |
index 24a5fb9906911f0a0badb496e63030802d7821a7..fb4be2156946987a9c8ad55c8d75476f10ad370e 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); |
@@ -3476,9 +3477,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); |
@@ -3518,9 +3520,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); |
@@ -3562,9 +3565,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); |
@@ -3612,10 +3616,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); |
@@ -3642,12 +3647,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); |
@@ -3688,12 +3694,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); |