[Page Load Metrics] Structure PageLoadTiming.

chrome/browser/page_load_metrics/observers/amp_page_load_metrics_observer.cc

Index: chrome/browser/page_load_metrics/observers/amp_page_load_metrics_observer.cc
diff --git a/chrome/browser/page_load_metrics/observers/amp_page_load_metrics_observer.cc b/chrome/browser/page_load_metrics/observers/amp_page_load_metrics_observer.cc
index baa7234485ce248cf85f49f16b71c3ca116475ae..03af34c5fab0831c54fc6494882244c4bf42badf 100644
--- a/chrome/browser/page_load_metrics/observers/amp_page_load_metrics_observer.cc
+++ b/chrome/browser/page_load_metrics/observers/amp_page_load_metrics_observer.cc
@@ -64,51 +64,54 @@ void AMPPageLoadMetricsObserver::OnDomContentLoadedEventStart(
     const page_load_metrics::PageLoadTiming& timing,
     const page_load_metrics::PageLoadExtraInfo& info) {
   if (!WasStartedInForegroundOptionalEventInForeground(
-          timing.dom_content_loaded_event_start, info)) {
+          timing.document_timing.dom_content_loaded_event_start, info)) {
     return;
   }
-  PAGE_LOAD_HISTOGRAM(kHistogramAMPDOMContentLoadedEventFired,
-                      timing.dom_content_loaded_event_start.value());
+  PAGE_LOAD_HISTOGRAM(
+      kHistogramAMPDOMContentLoadedEventFired,
+      timing.document_timing.dom_content_loaded_event_start.value());
 }
 
 void AMPPageLoadMetricsObserver::OnLoadEventStart(
     const page_load_metrics::PageLoadTiming& timing,
     const page_load_metrics::PageLoadExtraInfo& info) {
-  if (!WasStartedInForegroundOptionalEventInForeground(timing.load_event_start,
-                                                       info)) {
+  if (!WasStartedInForegroundOptionalEventInForeground(
+          timing.document_timing.load_event_start, info)) {
     return;
   }
   PAGE_LOAD_HISTOGRAM(kHistogramAMPLoadEventFired,
-                      timing.load_event_start.value());
+                      timing.document_timing.load_event_start.value());
 }
 
 void AMPPageLoadMetricsObserver::OnFirstLayout(
     const page_load_metrics::PageLoadTiming& timing,
     const page_load_metrics::PageLoadExtraInfo& info) {
-  if (!WasStartedInForegroundOptionalEventInForeground(timing.first_layout,
-                                                       info)) {
+  if (!WasStartedInForegroundOptionalEventInForeground(
+          timing.document_timing.first_layout, info)) {
     return;
   }
-  PAGE_LOAD_HISTOGRAM(kHistogramAMPFirstLayout, timing.first_layout.value());
+  PAGE_LOAD_HISTOGRAM(kHistogramAMPFirstLayout,
+                      timing.document_timing.first_layout.value());
 }
 
 void AMPPageLoadMetricsObserver::OnFirstContentfulPaint(
     const page_load_metrics::PageLoadTiming& timing,
     const page_load_metrics::PageLoadExtraInfo& info) {
   if (!WasStartedInForegroundOptionalEventInForeground(
-          timing.first_contentful_paint, info)) {
+          timing.paint_timing.first_contentful_paint, info)) {
     return;
   }
   PAGE_LOAD_HISTOGRAM(kHistogramAMPFirstContentfulPaint,
-                      timing.first_contentful_paint.value());
+                      timing.paint_timing.first_contentful_paint.value());
 }
 
 void AMPPageLoadMetricsObserver::OnParseStart(
     const page_load_metrics::PageLoadTiming& timing,
     const page_load_metrics::PageLoadExtraInfo& info) {
-  if (!WasStartedInForegroundOptionalEventInForeground(timing.parse_start,
-                                                       info)) {
+  if (!WasStartedInForegroundOptionalEventInForeground(
+          timing.parse_timing.parse_start, info)) {
     return;
   }
-  PAGE_LOAD_HISTOGRAM(kHistogramAMPParseStart, timing.parse_start.value());
+  PAGE_LOAD_HISTOGRAM(kHistogramAMPParseStart,
+                      timing.parse_timing.parse_start.value());
 }