| Index: chrome/browser/page_load_metrics/observers/document_write_page_load_metrics_observer_unittest.cc
|
| diff --git a/chrome/browser/page_load_metrics/observers/document_write_page_load_metrics_observer_unittest.cc b/chrome/browser/page_load_metrics/observers/document_write_page_load_metrics_observer_unittest.cc
|
| index 7b8dad7fce9f4fc7de8ea7894fbea6e47eae148b..c41596fa8ede593ef02951bc49d4d9e4090ad2b1 100644
|
| --- a/chrome/browser/page_load_metrics/observers/document_write_page_load_metrics_observer_unittest.cc
|
| +++ b/chrome/browser/page_load_metrics/observers/document_write_page_load_metrics_observer_unittest.cc
|
| @@ -34,13 +34,14 @@ TEST_F(DocumentWritePageLoadMetricsObserverTest, NoMetrics) {
|
|
|
| TEST_F(DocumentWritePageLoadMetricsObserverTest, PossiblePreload) {
|
| base::TimeDelta contentful_paint = base::TimeDelta::FromMilliseconds(1);
|
| - page_load_metrics::PageLoadTiming timing;
|
| + page_load_metrics::mojom::PageLoadTiming timing;
|
| + page_load_metrics::InitPageLoadTimingForTest(&timing);
|
| timing.navigation_start = base::Time::FromDoubleT(1);
|
| - timing.paint_timing.first_contentful_paint = contentful_paint;
|
| - timing.parse_timing.parse_start = base::TimeDelta::FromMilliseconds(1);
|
| + timing.paint_timing->first_contentful_paint = contentful_paint;
|
| + timing.parse_timing->parse_start = base::TimeDelta::FromMilliseconds(1);
|
| PopulateRequiredTimingFields(&timing);
|
|
|
| - page_load_metrics::PageLoadMetadata metadata;
|
| + page_load_metrics::mojom::PageLoadMetadata metadata;
|
| metadata.behavior_flags |=
|
| blink::WebLoadingBehaviorFlag::kWebLoadingBehaviorDocumentWriteEvaluator;
|
| NavigateAndCommit(GURL("https://www.google.com"));
|
| @@ -63,12 +64,13 @@ TEST_F(DocumentWritePageLoadMetricsObserverTest, PossiblePreload) {
|
|
|
| TEST_F(DocumentWritePageLoadMetricsObserverTest, NoPossiblePreload) {
|
| base::TimeDelta contentful_paint = base::TimeDelta::FromMilliseconds(1);
|
| - page_load_metrics::PageLoadTiming timing;
|
| + page_load_metrics::mojom::PageLoadTiming timing;
|
| + page_load_metrics::InitPageLoadTimingForTest(&timing);
|
| timing.navigation_start = base::Time::FromDoubleT(1);
|
| - timing.paint_timing.first_contentful_paint = contentful_paint;
|
| + timing.paint_timing->first_contentful_paint = contentful_paint;
|
| PopulateRequiredTimingFields(&timing);
|
|
|
| - page_load_metrics::PageLoadMetadata metadata;
|
| + page_load_metrics::mojom::PageLoadMetadata metadata;
|
| NavigateAndCommit(GURL("https://www.google.com"));
|
| SimulateTimingAndMetadataUpdate(timing, metadata);
|
| NavigateAndCommit(GURL("https://www.example.com"));
|
| @@ -77,13 +79,14 @@ TEST_F(DocumentWritePageLoadMetricsObserverTest, NoPossiblePreload) {
|
|
|
| TEST_F(DocumentWritePageLoadMetricsObserverTest, PossibleBlock) {
|
| base::TimeDelta contentful_paint = base::TimeDelta::FromMilliseconds(1);
|
| - page_load_metrics::PageLoadTiming timing;
|
| + page_load_metrics::mojom::PageLoadTiming timing;
|
| + page_load_metrics::InitPageLoadTimingForTest(&timing);
|
| timing.navigation_start = base::Time::FromDoubleT(1);
|
| - timing.paint_timing.first_contentful_paint = contentful_paint;
|
| - timing.parse_timing.parse_start = base::TimeDelta::FromMilliseconds(1);
|
| + timing.paint_timing->first_contentful_paint = contentful_paint;
|
| + timing.parse_timing->parse_start = base::TimeDelta::FromMilliseconds(1);
|
| PopulateRequiredTimingFields(&timing);
|
|
|
| - page_load_metrics::PageLoadMetadata metadata;
|
| + page_load_metrics::mojom::PageLoadMetadata metadata;
|
| metadata.behavior_flags |=
|
| blink::WebLoadingBehaviorFlag::kWebLoadingBehaviorDocumentWriteBlock;
|
| NavigateAndCommit(GURL("https://www.google.com"));
|
| @@ -108,13 +111,14 @@ TEST_F(DocumentWritePageLoadMetricsObserverTest, PossibleBlock) {
|
|
|
| TEST_F(DocumentWritePageLoadMetricsObserverTest, PossibleBlockReload) {
|
| base::TimeDelta contentful_paint = base::TimeDelta::FromMilliseconds(1);
|
| - page_load_metrics::PageLoadTiming timing;
|
| + page_load_metrics::mojom::PageLoadTiming timing;
|
| + page_load_metrics::InitPageLoadTimingForTest(&timing);
|
| timing.navigation_start = base::Time::FromDoubleT(1);
|
| - timing.paint_timing.first_contentful_paint = contentful_paint;
|
| - timing.parse_timing.parse_start = base::TimeDelta::FromMilliseconds(1);
|
| + timing.paint_timing->first_contentful_paint = contentful_paint;
|
| + timing.parse_timing->parse_start = base::TimeDelta::FromMilliseconds(1);
|
| PopulateRequiredTimingFields(&timing);
|
|
|
| - page_load_metrics::PageLoadMetadata metadata;
|
| + page_load_metrics::mojom::PageLoadMetadata metadata;
|
| metadata.behavior_flags |= blink::WebLoadingBehaviorFlag::
|
| kWebLoadingBehaviorDocumentWriteBlockReload;
|
| NavigateAndCommit(GURL("https://www.google.com"));
|
| @@ -143,12 +147,13 @@ TEST_F(DocumentWritePageLoadMetricsObserverTest, PossibleBlockReload) {
|
|
|
| TEST_F(DocumentWritePageLoadMetricsObserverTest, NoPossibleBlock) {
|
| base::TimeDelta contentful_paint = base::TimeDelta::FromMilliseconds(1);
|
| - page_load_metrics::PageLoadTiming timing;
|
| + page_load_metrics::mojom::PageLoadTiming timing;
|
| + page_load_metrics::InitPageLoadTimingForTest(&timing);
|
| timing.navigation_start = base::Time::FromDoubleT(1);
|
| - timing.paint_timing.first_contentful_paint = contentful_paint;
|
| + timing.paint_timing->first_contentful_paint = contentful_paint;
|
| PopulateRequiredTimingFields(&timing);
|
|
|
| - page_load_metrics::PageLoadMetadata metadata;
|
| + page_load_metrics::mojom::PageLoadMetadata metadata;
|
| NavigateAndCommit(GURL("https://www.google.com"));
|
| SimulateTimingAndMetadataUpdate(timing, metadata);
|
|
|
|
|