[Page Load Metrics] Add mojom file to page load metrics.

chrome/browser/page_load_metrics/observers/subresource_filter_metrics_observer_unittest.cc

Index: chrome/browser/page_load_metrics/observers/subresource_filter_metrics_observer_unittest.cc
diff --git a/chrome/browser/page_load_metrics/observers/subresource_filter_metrics_observer_unittest.cc b/chrome/browser/page_load_metrics/observers/subresource_filter_metrics_observer_unittest.cc
index 0b8ead55d6547fcaa201b325ea02edad2b372c45..c9eb705d09b55a66fdbfe2c6543fc048b8d0428f 100644
--- a/chrome/browser/page_load_metrics/observers/subresource_filter_metrics_observer_unittest.cc
+++ b/chrome/browser/page_load_metrics/observers/subresource_filter_metrics_observer_unittest.cc
@@ -24,21 +24,23 @@ class SubresourceFilterMetricsObserverTest
                 .empty();
   }
 
-  void InitializePageLoadTiming(page_load_metrics::PageLoadTiming* timing) {
+  void InitializePageLoadTiming(
+      page_load_metrics::mojom::PageLoadTiming* timing) {
+    page_load_metrics::InitPageLoadTimingForTest(timing);
     timing->navigation_start = base::Time::FromDoubleT(1);
-    timing->parse_timing.parse_start = base::TimeDelta::FromMilliseconds(100);
-    timing->parse_timing.parse_stop = base::TimeDelta::FromMilliseconds(200);
-    timing->parse_timing.parse_blocked_on_script_load_duration =
+    timing->parse_timing->parse_start = base::TimeDelta::FromMilliseconds(100);
+    timing->parse_timing->parse_stop = base::TimeDelta::FromMilliseconds(200);
+    timing->parse_timing->parse_blocked_on_script_load_duration =
         base::TimeDelta::FromMilliseconds(10);
-    timing->parse_timing.parse_blocked_on_script_execution_duration =
+    timing->parse_timing->parse_blocked_on_script_execution_duration =
         base::TimeDelta::FromMilliseconds(20);
-    timing->paint_timing.first_contentful_paint =
+    timing->paint_timing->first_contentful_paint =
         base::TimeDelta::FromMilliseconds(300);
-    timing->paint_timing.first_meaningful_paint =
+    timing->paint_timing->first_meaningful_paint =
         base::TimeDelta::FromMilliseconds(400);
-    timing->document_timing.dom_content_loaded_event_start =
+    timing->document_timing->dom_content_loaded_event_start =
         base::TimeDelta::FromMilliseconds(1200);
-    timing->document_timing.load_event_start =
+    timing->document_timing->load_event_start =
         base::TimeDelta::FromMilliseconds(1500);
     PopulateRequiredTimingFields(timing);
   }
@@ -48,7 +50,7 @@ TEST_F(SubresourceFilterMetricsObserverTest,
        NoMetricsForNonSubresourceFilteredNavigation) {
   NavigateAndCommit(GURL(kDefaultTestUrl));
 
-  page_load_metrics::PageLoadTiming timing;
+  page_load_metrics::mojom::PageLoadTiming timing;
   InitializePageLoadTiming(&timing);
   SimulateTimingUpdate(timing);
 
@@ -62,9 +64,9 @@ TEST_F(SubresourceFilterMetricsObserverTest,
 TEST_F(SubresourceFilterMetricsObserverTest, Basic) {
   NavigateAndCommit(GURL(kDefaultTestUrl));
 
-  page_load_metrics::PageLoadTiming timing;
+  page_load_metrics::mojom::PageLoadTiming timing;
   InitializePageLoadTiming(&timing);
-  page_load_metrics::PageLoadMetadata metadata;
+  page_load_metrics::mojom::PageLoadMetadata metadata;
   metadata.behavior_flags |=
       blink::WebLoadingBehaviorFlag::kWebLoadingBehaviorSubresourceFilterMatch;
   SimulateTimingAndMetadataUpdate(timing, metadata);
@@ -81,14 +83,14 @@ TEST_F(SubresourceFilterMetricsObserverTest, Basic) {
       internal::kHistogramSubresourceFilterFirstContentfulPaint, 1);
   histogram_tester().ExpectBucketCount(
       internal::kHistogramSubresourceFilterFirstContentfulPaint,
-      timing.paint_timing.first_contentful_paint.value().InMilliseconds(), 1);
+      timing.paint_timing->first_contentful_paint.value().InMilliseconds(), 1);
 
   histogram_tester().ExpectTotalCount(
       internal::kHistogramSubresourceFilterParseStartToFirstContentfulPaint, 1);
   histogram_tester().ExpectBucketCount(
       internal::kHistogramSubresourceFilterParseStartToFirstContentfulPaint,
-      (timing.paint_timing.first_contentful_paint.value() -
-       timing.parse_timing.parse_start.value())
+      (timing.paint_timing->first_contentful_paint.value() -
+       timing.parse_timing->parse_start.value())
           .InMilliseconds(),
       1);
 
@@ -96,14 +98,14 @@ TEST_F(SubresourceFilterMetricsObserverTest, Basic) {
       internal::kHistogramSubresourceFilterFirstMeaningfulPaint, 1);
   histogram_tester().ExpectBucketCount(
       internal::kHistogramSubresourceFilterFirstMeaningfulPaint,
-      timing.paint_timing.first_meaningful_paint.value().InMilliseconds(), 1);
+      timing.paint_timing->first_meaningful_paint.value().InMilliseconds(), 1);
 
   histogram_tester().ExpectTotalCount(
       internal::kHistogramSubresourceFilterParseStartToFirstMeaningfulPaint, 1);
   histogram_tester().ExpectBucketCount(
       internal::kHistogramSubresourceFilterParseStartToFirstMeaningfulPaint,
-      (timing.paint_timing.first_meaningful_paint.value() -
-       timing.parse_timing.parse_start.value())
+      (timing.paint_timing->first_meaningful_paint.value() -
+       timing.parse_timing->parse_start.value())
           .InMilliseconds(),
       1);
 
@@ -111,7 +113,7 @@ TEST_F(SubresourceFilterMetricsObserverTest, Basic) {
       internal::kHistogramSubresourceFilterDomContentLoaded, 1);
   histogram_tester().ExpectBucketCount(
       internal::kHistogramSubresourceFilterDomContentLoaded,
-      timing.document_timing.dom_content_loaded_event_start.value()
+      timing.document_timing->dom_content_loaded_event_start.value()
           .InMilliseconds(),
       1);
 
@@ -119,14 +121,14 @@ TEST_F(SubresourceFilterMetricsObserverTest, Basic) {
                                       1);
   histogram_tester().ExpectBucketCount(
       internal::kHistogramSubresourceFilterLoad,
-      timing.document_timing.load_event_start.value().InMilliseconds(), 1);
+      timing.document_timing->load_event_start.value().InMilliseconds(), 1);
 
   histogram_tester().ExpectTotalCount(
       internal::kHistogramSubresourceFilterParseDuration, 1);
   histogram_tester().ExpectBucketCount(
       internal::kHistogramSubresourceFilterParseDuration,
-      (timing.parse_timing.parse_stop.value() -
-       timing.parse_timing.parse_start.value())
+      (timing.parse_timing->parse_stop.value() -
+       timing.parse_timing->parse_start.value())
           .InMilliseconds(),
       1);
 
@@ -134,7 +136,7 @@ TEST_F(SubresourceFilterMetricsObserverTest, Basic) {
       internal::kHistogramSubresourceFilterParseBlockedOnScriptLoad, 1);
   histogram_tester().ExpectBucketCount(
       internal::kHistogramSubresourceFilterParseBlockedOnScriptLoad,
-      timing.parse_timing.parse_blocked_on_script_load_duration.value()
+      timing.parse_timing->parse_blocked_on_script_load_duration.value()
           .InMilliseconds(),
       1);
 
@@ -142,7 +144,7 @@ TEST_F(SubresourceFilterMetricsObserverTest, Basic) {
       internal::kHistogramSubresourceFilterParseBlockedOnScriptExecution, 1);
   histogram_tester().ExpectBucketCount(
       internal::kHistogramSubresourceFilterParseBlockedOnScriptExecution,
-      timing.parse_timing.parse_blocked_on_script_execution_duration.value()
+      timing.parse_timing->parse_blocked_on_script_execution_duration.value()
           .InMilliseconds(),
       1);
 
@@ -159,9 +161,10 @@ TEST_F(SubresourceFilterMetricsObserverTest, Subresources) {
        nullptr /* data_reduction_proxy_data */,
        content::ResourceType::RESOURCE_TYPE_MAIN_FRAME});
 
-  page_load_metrics::PageLoadTiming timing;
+  page_load_metrics::mojom::PageLoadTiming timing;
+  page_load_metrics::InitPageLoadTimingForTest(&timing);
   timing.navigation_start = base::Time::FromDoubleT(1);
-  page_load_metrics::PageLoadMetadata metadata;
+  page_load_metrics::mojom::PageLoadMetadata metadata;
   metadata.behavior_flags |=
       blink::WebLoadingBehaviorFlag::kWebLoadingBehaviorSubresourceFilterMatch;
   SimulateTimingAndMetadataUpdate(timing, metadata);
@@ -258,9 +261,10 @@ TEST_F(SubresourceFilterMetricsObserverTest, SubresourcesWithMedia) {
        nullptr /* data_reduction_proxy_data */,
        content::ResourceType::RESOURCE_TYPE_MAIN_FRAME});
 
-  page_load_metrics::PageLoadTiming timing;
+  page_load_metrics::mojom::PageLoadTiming timing;
+  page_load_metrics::InitPageLoadTimingForTest(&timing);
   timing.navigation_start = base::Time::FromDoubleT(1);
-  page_load_metrics::PageLoadMetadata metadata;
+  page_load_metrics::mojom::PageLoadMetadata metadata;
   metadata.behavior_flags |=
       blink::WebLoadingBehaviorFlag::kWebLoadingBehaviorSubresourceFilterMatch;
   SimulateTimingAndMetadataUpdate(timing, metadata);