[Page Load Metrics] Structure PageLoadTiming.

chrome/browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.cc

Index: chrome/browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.cc
diff --git a/chrome/browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.cc b/chrome/browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.cc
index c74e1b8e54cb7b58a5c70abd5f581f74a8f8b420..72e61bb4648c412132d1c6c68e526b3f61dede13 100644
--- a/chrome/browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.cc
+++ b/chrome/browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.cc
@@ -53,55 +53,67 @@ PageLoadMetricsObserverTestHarness::~PageLoadMetricsObserverTestHarness() {}
 // static
 void PageLoadMetricsObserverTestHarness::PopulateRequiredTimingFields(
     PageLoadTiming* inout_timing) {
-  if (inout_timing->first_meaningful_paint &&
-      !inout_timing->first_contentful_paint) {
-    inout_timing->first_contentful_paint = inout_timing->first_meaningful_paint;
+  if (inout_timing->paint_timing.first_meaningful_paint &&
+      !inout_timing->paint_timing.first_contentful_paint) {
+    inout_timing->paint_timing.first_contentful_paint =
+        inout_timing->paint_timing.first_meaningful_paint;
   }
-  if ((inout_timing->first_text_paint || inout_timing->first_image_paint ||
-       inout_timing->first_contentful_paint) &&
-      !inout_timing->first_paint) {
-    inout_timing->first_paint =
-        OptionalMin(OptionalMin(inout_timing->first_text_paint,
-                                inout_timing->first_image_paint),
-                    inout_timing->first_contentful_paint);
+  if ((inout_timing->paint_timing.first_text_paint ||
+       inout_timing->paint_timing.first_image_paint ||
+       inout_timing->paint_timing.first_contentful_paint) &&
+      !inout_timing->paint_timing.first_paint) {
+    inout_timing->paint_timing.first_paint =
+        OptionalMin(OptionalMin(inout_timing->paint_timing.first_text_paint,
+                                inout_timing->paint_timing.first_image_paint),
+                    inout_timing->paint_timing.first_contentful_paint);
   }
-  if (inout_timing->first_paint && !inout_timing->first_layout) {
-    inout_timing->first_layout = inout_timing->first_paint;
+  if (inout_timing->paint_timing.first_paint &&
+      !inout_timing->document_timing.first_layout) {
+    inout_timing->document_timing.first_layout =
+        inout_timing->paint_timing.first_paint;
   }
-  if (inout_timing->load_event_start &&
-      !inout_timing->dom_content_loaded_event_start) {
-    inout_timing->dom_content_loaded_event_start =
-        inout_timing->load_event_start;
+  if (inout_timing->document_timing.load_event_start &&
+      !inout_timing->document_timing.dom_content_loaded_event_start) {
+    inout_timing->document_timing.dom_content_loaded_event_start =
+        inout_timing->document_timing.load_event_start;
   }
-  if (inout_timing->first_layout && !inout_timing->parse_start) {
-    inout_timing->parse_start = inout_timing->first_layout;
+  if (inout_timing->document_timing.first_layout &&
+      !inout_timing->parse_timing.parse_start) {
+    inout_timing->parse_timing.parse_start =
+        inout_timing->document_timing.first_layout;
   }
-  if (inout_timing->dom_content_loaded_event_start &&
-      !inout_timing->parse_stop) {
-    inout_timing->parse_stop = inout_timing->dom_content_loaded_event_start;
+  if (inout_timing->document_timing.dom_content_loaded_event_start &&
+      !inout_timing->parse_timing.parse_stop) {
+    inout_timing->parse_timing.parse_stop =
+        inout_timing->document_timing.dom_content_loaded_event_start;
   }
-  if (inout_timing->parse_stop && !inout_timing->parse_start) {
-    inout_timing->parse_start = inout_timing->parse_stop;
+  if (inout_timing->parse_timing.parse_stop &&
+      !inout_timing->parse_timing.parse_start) {
+    inout_timing->parse_timing.parse_start =
+        inout_timing->parse_timing.parse_stop;
   }
-  if (inout_timing->parse_start && !inout_timing->response_start) {
-    inout_timing->response_start = inout_timing->parse_start;
+  if (inout_timing->parse_timing.parse_start && !inout_timing->response_start) {
+    inout_timing->response_start = inout_timing->parse_timing.parse_start;
   }
-  if (inout_timing->parse_start) {
-    if (!inout_timing->parse_blocked_on_script_load_duration)
-      inout_timing->parse_blocked_on_script_load_duration = base::TimeDelta();
-    if (!inout_timing->parse_blocked_on_script_execution_duration) {
-      inout_timing->parse_blocked_on_script_execution_duration =
+  if (inout_timing->parse_timing.parse_start) {
+    if (!inout_timing->parse_timing.parse_blocked_on_script_load_duration)
+      inout_timing->parse_timing.parse_blocked_on_script_load_duration =
+          base::TimeDelta();
+    if (!inout_timing->parse_timing
+             .parse_blocked_on_script_execution_duration) {
+      inout_timing->parse_timing.parse_blocked_on_script_execution_duration =
           base::TimeDelta();
     }
-    if (!inout_timing
-             ->parse_blocked_on_script_load_from_document_write_duration) {
-      inout_timing->parse_blocked_on_script_load_from_document_write_duration =
+    if (!inout_timing->parse_timing
+             .parse_blocked_on_script_load_from_document_write_duration) {
+      inout_timing->parse_timing
+          .parse_blocked_on_script_load_from_document_write_duration =
           base::TimeDelta();
     }
-    if (!inout_timing
-             ->parse_blocked_on_script_execution_from_document_write_duration) {
-      inout_timing
-          ->parse_blocked_on_script_execution_from_document_write_duration =
+    if (!inout_timing->parse_timing
+             .parse_blocked_on_script_execution_from_document_write_duration) {
+      inout_timing->parse_timing
+          .parse_blocked_on_script_execution_from_document_write_duration =
           base::TimeDelta();
     }
   }