[Page Load Metrics] Structure PageLoadTiming.

chrome/browser/page_load_metrics/observers/service_worker_page_load_metrics_observer.cc

Index: chrome/browser/page_load_metrics/observers/service_worker_page_load_metrics_observer.cc
diff --git a/chrome/browser/page_load_metrics/observers/service_worker_page_load_metrics_observer.cc b/chrome/browser/page_load_metrics/observers/service_worker_page_load_metrics_observer.cc
index 37412b4eda39f9ba8b97a8a31d737cc24708294d..bc19236fcce61055a6f0fb7372e307364be6d556 100644
--- a/chrome/browser/page_load_metrics/observers/service_worker_page_load_metrics_observer.cc
+++ b/chrome/browser/page_load_metrics/observers/service_worker_page_load_metrics_observer.cc
@@ -67,25 +67,27 @@ void ServiceWorkerPageLoadMetricsObserver::OnFirstContentfulPaint(
   if (!IsServiceWorkerControlled(info))
     return;
   if (!WasStartedInForegroundOptionalEventInForeground(
-          timing.first_contentful_paint, info)) {
+          timing.paint_timing.first_contentful_paint, info)) {
     PAGE_LOAD_HISTOGRAM(
         internal::kBackgroundHistogramServiceWorkerFirstContentfulPaint,
-        timing.first_contentful_paint.value());
+        timing.paint_timing.first_contentful_paint.value());
     return;
   }
   PAGE_LOAD_HISTOGRAM(internal::kHistogramServiceWorkerFirstContentfulPaint,
-                      timing.first_contentful_paint.value());
+                      timing.paint_timing.first_contentful_paint.value());
   PAGE_LOAD_HISTOGRAM(
       internal::kHistogramServiceWorkerParseStartToFirstContentfulPaint,
-      timing.first_contentful_paint.value() - timing.parse_start.value());
+      timing.paint_timing.first_contentful_paint.value() -
+          timing.parse_timing.parse_start.value());
 
   if (IsInboxSite(info.url)) {
     PAGE_LOAD_HISTOGRAM(
         internal::kHistogramServiceWorkerFirstContentfulPaintInbox,
-        timing.first_contentful_paint.value());
+        timing.paint_timing.first_contentful_paint.value());
     PAGE_LOAD_HISTOGRAM(
         internal::kHistogramServiceWorkerParseStartToFirstContentfulPaintInbox,
-        timing.first_contentful_paint.value() - timing.parse_start.value());
+        timing.paint_timing.first_contentful_paint.value() -
+            timing.parse_timing.parse_start.value());
   }
 }
 
@@ -95,14 +97,16 @@ void ServiceWorkerPageLoadMetricsObserver::OnDomContentLoadedEventStart(
   if (!IsServiceWorkerControlled(info))
     return;
   if (!WasStartedInForegroundOptionalEventInForeground(
-          timing.dom_content_loaded_event_start, info)) {
+          timing.document_timing.dom_content_loaded_event_start, info)) {
     return;
   }
-  PAGE_LOAD_HISTOGRAM(internal::kHistogramServiceWorkerDomContentLoaded,
-                      timing.dom_content_loaded_event_start.value());
+  PAGE_LOAD_HISTOGRAM(
+      internal::kHistogramServiceWorkerDomContentLoaded,
+      timing.document_timing.dom_content_loaded_event_start.value());
   if (IsInboxSite(info.url)) {
-    PAGE_LOAD_HISTOGRAM(internal::kHistogramServiceWorkerDomContentLoadedInbox,
-                        timing.dom_content_loaded_event_start.value());
+    PAGE_LOAD_HISTOGRAM(
+        internal::kHistogramServiceWorkerDomContentLoadedInbox,
+        timing.document_timing.dom_content_loaded_event_start.value());
   }
 }
 
@@ -111,14 +115,14 @@ void ServiceWorkerPageLoadMetricsObserver::OnLoadEventStart(
     const page_load_metrics::PageLoadExtraInfo& info) {
   if (!IsServiceWorkerControlled(info))
     return;
-  if (!WasStartedInForegroundOptionalEventInForeground(timing.load_event_start,
-                                                       info))
+  if (!WasStartedInForegroundOptionalEventInForeground(
+          timing.document_timing.load_event_start, info))
     return;
   PAGE_LOAD_HISTOGRAM(internal::kHistogramServiceWorkerLoad,
-                      timing.load_event_start.value());
+                      timing.document_timing.load_event_start.value());
   if (IsInboxSite(info.url)) {
     PAGE_LOAD_HISTOGRAM(internal::kHistogramServiceWorkerLoadInbox,
-                        timing.load_event_start.value());
+                        timing.document_timing.load_event_start.value());
   }
 }
 
@@ -127,12 +131,12 @@ void ServiceWorkerPageLoadMetricsObserver::OnParseStart(
     const page_load_metrics::PageLoadExtraInfo& info) {
   if (!IsServiceWorkerControlled(info))
     return;
-  if (WasStartedInForegroundOptionalEventInForeground(timing.parse_start,
-                                                      info)) {
+  if (WasStartedInForegroundOptionalEventInForeground(
+          timing.parse_timing.parse_start, info)) {
     PAGE_LOAD_HISTOGRAM(internal::kHistogramServiceWorkerParseStart,
-                        timing.parse_start.value());
+                        timing.parse_timing.parse_start.value());
   } else {
     PAGE_LOAD_HISTOGRAM(internal::kBackgroundHistogramServiceWorkerParseStart,
-                        timing.parse_start.value());
+                        timing.parse_timing.parse_start.value());
   }
 }