[Page Load Metrics] Structure PageLoadTiming.

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 d16bcd463d323fc90a9980ef5b0fc7dc19767d19..7e2822338f2249f28161de7ea7e196a842ccc9a7 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
@@ -26,17 +26,20 @@ class SubresourceFilterMetricsObserverTest
 
   void InitializePageLoadTiming(page_load_metrics::PageLoadTiming* timing) {
     timing->navigation_start = base::Time::FromDoubleT(1);
-    timing->parse_start = base::TimeDelta::FromMilliseconds(100);
-    timing->parse_stop = base::TimeDelta::FromMilliseconds(200);
-    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_blocked_on_script_execution_duration =
+    timing->parse_timing.parse_blocked_on_script_execution_duration =
         base::TimeDelta::FromMilliseconds(20);
-    timing->first_contentful_paint = base::TimeDelta::FromMilliseconds(300);
-    timing->first_meaningful_paint = base::TimeDelta::FromMilliseconds(400);
-    timing->dom_content_loaded_event_start =
+    timing->paint_timing.first_contentful_paint =
+        base::TimeDelta::FromMilliseconds(300);
+    timing->paint_timing.first_meaningful_paint =
+        base::TimeDelta::FromMilliseconds(400);
+    timing->document_timing.dom_content_loaded_event_start =
         base::TimeDelta::FromMilliseconds(1200);
-    timing->load_event_start = base::TimeDelta::FromMilliseconds(1500);
+    timing->document_timing.load_event_start =
+        base::TimeDelta::FromMilliseconds(1500);
     PopulateRequiredTimingFields(timing);
   }
 };
@@ -78,13 +81,14 @@ TEST_F(SubresourceFilterMetricsObserverTest, Basic) {
       internal::kHistogramSubresourceFilterFirstContentfulPaint, 1);
   histogram_tester().ExpectBucketCount(
       internal::kHistogramSubresourceFilterFirstContentfulPaint,
-      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.first_contentful_paint.value() - timing.parse_start.value())
+      (timing.paint_timing.first_contentful_paint.value() -
+       timing.parse_timing.parse_start.value())
           .InMilliseconds(),
       1);
 
@@ -92,13 +96,14 @@ TEST_F(SubresourceFilterMetricsObserverTest, Basic) {
       internal::kHistogramSubresourceFilterFirstMeaningfulPaint, 1);
   histogram_tester().ExpectBucketCount(
       internal::kHistogramSubresourceFilterFirstMeaningfulPaint,
-      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.first_meaningful_paint.value() - timing.parse_start.value())
+      (timing.paint_timing.first_meaningful_paint.value() -
+       timing.parse_timing.parse_start.value())
           .InMilliseconds(),
       1);
 
@@ -106,32 +111,38 @@ TEST_F(SubresourceFilterMetricsObserverTest, Basic) {
       internal::kHistogramSubresourceFilterDomContentLoaded, 1);
   histogram_tester().ExpectBucketCount(
       internal::kHistogramSubresourceFilterDomContentLoaded,
-      timing.dom_content_loaded_event_start.value().InMilliseconds(), 1);
+      timing.document_timing.dom_content_loaded_event_start.value()
+          .InMilliseconds(),
+      1);
 
   histogram_tester().ExpectTotalCount(internal::kHistogramSubresourceFilterLoad,
                                       1);
   histogram_tester().ExpectBucketCount(
       internal::kHistogramSubresourceFilterLoad,
-      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_stop.value() - timing.parse_start.value()).InMilliseconds(),
+      (timing.parse_timing.parse_stop.value() -
+       timing.parse_timing.parse_start.value())
+          .InMilliseconds(),
       1);
 
   histogram_tester().ExpectTotalCount(
       internal::kHistogramSubresourceFilterParseBlockedOnScriptLoad, 1);
   histogram_tester().ExpectBucketCount(
       internal::kHistogramSubresourceFilterParseBlockedOnScriptLoad,
-      timing.parse_blocked_on_script_load_duration.value().InMilliseconds(), 1);
+      timing.parse_timing.parse_blocked_on_script_load_duration.value()
+          .InMilliseconds(),
+      1);
 
   histogram_tester().ExpectTotalCount(
       internal::kHistogramSubresourceFilterParseBlockedOnScriptExecution, 1);
   histogram_tester().ExpectBucketCount(
       internal::kHistogramSubresourceFilterParseBlockedOnScriptExecution,
-      timing.parse_blocked_on_script_execution_duration.value()
+      timing.parse_timing.parse_blocked_on_script_execution_duration.value()
           .InMilliseconds(),
       1);