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

chrome/browser/page_load_metrics/observers/core_page_load_metrics_observer_unittest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/page_load_metrics/observers/core_page_load_metrics_observer.h"
 
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.h"
 #include "chrome/browser/page_load_metrics/page_load_metrics_util.h"
 #include "chrome/test/base/testing_browser_process.h"
@@ skipping 30 matching lines @@
   histogram_tester().ExpectTotalCount(internal::kHistogramDomContentLoaded, 0);
   histogram_tester().ExpectTotalCount(internal::kHistogramLoad, 0);
   histogram_tester().ExpectTotalCount(internal::kHistogramFirstLayout, 0);
   histogram_tester().ExpectTotalCount(internal::kHistogramFirstTextPaint, 0);
 }
 
 TEST_F(CorePageLoadMetricsObserverTest,
        SameDocumentNoTriggerUntilTrueNavCommit) {
   base::TimeDelta first_layout = base::TimeDelta::FromMilliseconds(1);
 
-  page_load_metrics::PageLoadTiming timing;
+  page_load_metrics::mojom::PageLoadTiming timing;
+  page_load_metrics::InitPageLoadTimingForTest(&timing);
   timing.navigation_start = base::Time::FromDoubleT(1);
-  timing.document_timing.first_layout = first_layout;
+  timing.document_timing->first_layout = first_layout;
   PopulateRequiredTimingFields(&timing);
 
   NavigateAndCommit(GURL(kDefaultTestUrl));
   SimulateTimingUpdate(timing);
 
   NavigateAndCommit(GURL(kDefaultTestUrlAnchor));
 
   NavigateAndCommit(GURL(kDefaultTestUrl2));
   histogram_tester().ExpectTotalCount(internal::kHistogramDomContentLoaded, 0);
   histogram_tester().ExpectTotalCount(internal::kHistogramLoad, 0);
   histogram_tester().ExpectTotalCount(internal::kHistogramFirstLayout, 1);
   histogram_tester().ExpectBucketCount(internal::kHistogramFirstLayout,
                                        first_layout.InMilliseconds(), 1);
   histogram_tester().ExpectTotalCount(internal::kHistogramFirstTextPaint, 0);
 }
 
 TEST_F(CorePageLoadMetricsObserverTest, SingleMetricAfterCommit) {
   base::TimeDelta first_layout = base::TimeDelta::FromMilliseconds(1);
   base::TimeDelta parse_start = base::TimeDelta::FromMilliseconds(1);
   base::TimeDelta parse_stop = base::TimeDelta::FromMilliseconds(5);
   base::TimeDelta parse_script_load_duration =
       base::TimeDelta::FromMilliseconds(3);
   base::TimeDelta parse_script_exec_duration =
       base::TimeDelta::FromMilliseconds(1);
 
-  page_load_metrics::PageLoadTiming timing;
+  page_load_metrics::mojom::PageLoadTiming timing;
+  page_load_metrics::InitPageLoadTimingForTest(&timing);
   timing.navigation_start = base::Time::FromDoubleT(1);
-  timing.document_timing.first_layout = first_layout;
-  timing.parse_timing.parse_start = parse_start;
-  timing.parse_timing.parse_stop = parse_stop;
-  timing.parse_timing.parse_blocked_on_script_load_duration =
+  timing.document_timing->first_layout = first_layout;
+  timing.parse_timing->parse_start = parse_start;
+  timing.parse_timing->parse_stop = parse_stop;
+  timing.parse_timing->parse_blocked_on_script_load_duration =
       parse_script_load_duration;
-  timing.parse_timing.parse_blocked_on_script_execution_duration =
+  timing.parse_timing->parse_blocked_on_script_execution_duration =
       parse_script_exec_duration;
   PopulateRequiredTimingFields(&timing);
 
   NavigateAndCommit(GURL(kDefaultTestUrl));
   SimulateTimingUpdate(timing);
 
   // Navigate again to force histogram recording.
   NavigateAndCommit(GURL(kDefaultTestUrl2));
 
   histogram_tester().ExpectTotalCount(internal::kHistogramDomContentLoaded, 0);
@@ skipping 18 matching lines @@
 
 TEST_F(CorePageLoadMetricsObserverTest, MultipleMetricsAfterCommits) {
   base::TimeDelta response = base::TimeDelta::FromMilliseconds(1);
   base::TimeDelta first_layout_1 = base::TimeDelta::FromMilliseconds(10);
   base::TimeDelta first_layout_2 = base::TimeDelta::FromMilliseconds(20);
   base::TimeDelta first_text_paint = base::TimeDelta::FromMilliseconds(30);
   base::TimeDelta first_contentful_paint = first_text_paint;
   base::TimeDelta dom_content = base::TimeDelta::FromMilliseconds(40);
   base::TimeDelta load = base::TimeDelta::FromMilliseconds(100);
 
-  page_load_metrics::PageLoadTiming timing;
+  page_load_metrics::mojom::PageLoadTiming timing;
+  page_load_metrics::InitPageLoadTimingForTest(&timing);
   timing.navigation_start = base::Time::FromDoubleT(1);
   timing.response_start = response;
-  timing.document_timing.first_layout = first_layout_1;
-  timing.paint_timing.first_text_paint = first_text_paint;
-  timing.paint_timing.first_contentful_paint = first_contentful_paint;
-  timing.document_timing.dom_content_loaded_event_start = dom_content;
-  timing.document_timing.load_event_start = load;
+  timing.document_timing->first_layout = first_layout_1;
+  timing.paint_timing->first_text_paint = first_text_paint;
+  timing.paint_timing->first_contentful_paint = first_contentful_paint;
+  timing.document_timing->dom_content_loaded_event_start = dom_content;
+  timing.document_timing->load_event_start = load;
   PopulateRequiredTimingFields(&timing);
 
   NavigateAndCommit(GURL(kDefaultTestUrl));
   SimulateTimingUpdate(timing);
 
   histogram_tester().ExpectTotalCount(internal::kHistogramFirstContentfulPaint,
                                       1);
   histogram_tester().ExpectBucketCount(internal::kHistogramFirstContentfulPaint,
                                        first_contentful_paint.InMilliseconds(),
                                        1);
 
   NavigateAndCommit(GURL(kDefaultTestUrl2));
 
-  page_load_metrics::PageLoadTiming timing2;
+  page_load_metrics::mojom::PageLoadTiming timing2;
+  page_load_metrics::InitPageLoadTimingForTest(&timing2);
   timing2.navigation_start = base::Time::FromDoubleT(200);
-  timing2.document_timing.first_layout = first_layout_2;
+  timing2.document_timing->first_layout = first_layout_2;
   PopulateRequiredTimingFields(&timing2);
 
   SimulateTimingUpdate(timing2);
 
   NavigateAndCommit(GURL(kDefaultTestUrl));
 
   histogram_tester().ExpectTotalCount(internal::kHistogramFirstLayout, 2);
   histogram_tester().ExpectBucketCount(internal::kHistogramFirstLayout,
                                        first_layout_1.InMilliseconds(), 1);
   histogram_tester().ExpectBucketCount(internal::kHistogramFirstLayout,
@@ skipping 13 matching lines @@
                                        dom_content.InMilliseconds(), 1);
 
   histogram_tester().ExpectTotalCount(internal::kHistogramLoad, 1);
   histogram_tester().ExpectBucketCount(internal::kHistogramLoad,
                                        load.InMilliseconds(), 1);
 }
 
 TEST_F(CorePageLoadMetricsObserverTest, BackgroundDifferentHistogram) {
   base::TimeDelta first_layout = base::TimeDelta::FromSeconds(2);
 
-  page_load_metrics::PageLoadTiming timing;
+  page_load_metrics::mojom::PageLoadTiming timing;
+  page_load_metrics::InitPageLoadTimingForTest(&timing);
   timing.navigation_start = base::Time::FromDoubleT(1);
-  timing.document_timing.first_layout = first_layout;
+  timing.document_timing->first_layout = first_layout;
   PopulateRequiredTimingFields(&timing);
 
   // Simulate "Open link in new tab."
   web_contents()->WasHidden();
   NavigateAndCommit(GURL(kDefaultTestUrl));
   SimulateTimingUpdate(timing);
 
   // Simulate switching to the tab and making another navigation.
   web_contents()->WasShown();
 
@@ skipping 11 matching lines @@
   histogram_tester().ExpectTotalCount(
       internal::kBackgroundHistogramFirstTextPaint, 0);
 
   histogram_tester().ExpectTotalCount(internal::kHistogramDomContentLoaded, 0);
   histogram_tester().ExpectTotalCount(internal::kHistogramLoad, 0);
   histogram_tester().ExpectTotalCount(internal::kHistogramFirstLayout, 0);
   histogram_tester().ExpectTotalCount(internal::kHistogramFirstTextPaint, 0);
 }
 
 TEST_F(CorePageLoadMetricsObserverTest, OnlyBackgroundLaterEvents) {
-  page_load_metrics::PageLoadTiming timing;
+  page_load_metrics::mojom::PageLoadTiming timing;
+  page_load_metrics::InitPageLoadTimingForTest(&timing);
   timing.navigation_start = base::Time::FromDoubleT(1);
-  timing.document_timing.dom_content_loaded_event_start =
+  timing.document_timing->dom_content_loaded_event_start =
       base::TimeDelta::FromMicroseconds(1);
   PopulateRequiredTimingFields(&timing);
 
   // Make sure first_text_paint hasn't been set (wasn't set by
   // PopulateRequiredTimingFields), since we want to defer setting it until
   // after backgrounding.
-  ASSERT_FALSE(timing.paint_timing.first_text_paint);
+  ASSERT_FALSE(timing.paint_timing->first_text_paint);
 
   NavigateAndCommit(GURL(kDefaultTestUrl));
   SimulateTimingUpdate(timing);
 
   // Background the tab, then foreground it.
   web_contents()->WasHidden();
   web_contents()->WasShown();
-  timing.paint_timing.first_text_paint = base::TimeDelta::FromSeconds(4);
+  timing.paint_timing->first_text_paint = base::TimeDelta::FromSeconds(4);
   PopulateRequiredTimingFields(&timing);
   SimulateTimingUpdate(timing);
 
   // If the system clock is low resolution, PageLoadTracker's
   // first_background_time_ may be same as other times such as
   // dom_content_loaded_event_start.
   page_load_metrics::PageLoadExtraInfo info =
       GetPageLoadExtraInfoForCommittedLoad();
 
   // Navigate again to force histogram recording.
   NavigateAndCommit(GURL(kDefaultTestUrl2));
 
   if (page_load_metrics::WasStartedInForegroundOptionalEventInForeground(
-          timing.document_timing.dom_content_loaded_event_start, info)) {
+          timing.document_timing->dom_content_loaded_event_start, info)) {
     histogram_tester().ExpectTotalCount(internal::kHistogramDomContentLoaded,
                                         1);
     histogram_tester().ExpectBucketCount(
         internal::kHistogramDomContentLoaded,
-        timing.document_timing.dom_content_loaded_event_start.value()
+        timing.document_timing->dom_content_loaded_event_start.value()
             .InMilliseconds(),
         1);
     histogram_tester().ExpectTotalCount(
         internal::kBackgroundHistogramDomContentLoaded, 0);
   } else {
     histogram_tester().ExpectTotalCount(
         internal::kBackgroundHistogramDomContentLoaded, 1);
     histogram_tester().ExpectTotalCount(internal::kHistogramDomContentLoaded,
                                         0);
   }
 
   histogram_tester().ExpectTotalCount(internal::kBackgroundHistogramLoad, 0);
   histogram_tester().ExpectTotalCount(
       internal::kBackgroundHistogramFirstTextPaint, 1);
   histogram_tester().ExpectBucketCount(
       internal::kBackgroundHistogramFirstTextPaint,
-      timing.paint_timing.first_text_paint.value().InMilliseconds(), 1);
+      timing.paint_timing->first_text_paint.value().InMilliseconds(), 1);
 
   histogram_tester().ExpectTotalCount(internal::kHistogramLoad, 0);
   histogram_tester().ExpectTotalCount(internal::kHistogramFirstTextPaint, 0);
 
   histogram_tester().ExpectTotalCount(
       internal::kHistogramPageTimingForegroundDuration, 1);
 }
 
 TEST_F(CorePageLoadMetricsObserverTest, DontBackgroundQuickerLoad) {
   // Set this event at 1 microsecond so it occurs before we foreground later in
   // the test.
   base::TimeDelta first_layout = base::TimeDelta::FromMicroseconds(1);
 
-  page_load_metrics::PageLoadTiming timing;
+  page_load_metrics::mojom::PageLoadTiming timing;
+  page_load_metrics::InitPageLoadTimingForTest(&timing);
   timing.navigation_start = base::Time::FromDoubleT(1);
-  timing.document_timing.first_layout = first_layout;
+  timing.document_timing->first_layout = first_layout;
   PopulateRequiredTimingFields(&timing);
 
   web_contents()->WasHidden();
 
   // Open in new tab
   StartNavigation(GURL(kDefaultTestUrl));
 
   // Switch to the tab
   web_contents()->WasShown();
 
@@ skipping 54 matching lines @@
 }
 
 TEST_F(CorePageLoadMetricsObserverTest, NoRappor) {
   rappor::TestSample::Shadow* sample_obj =
       rappor_tester_.GetRecordedSampleForMetric(
           internal::kRapporMetricsNameCoarseTiming);
   EXPECT_EQ(sample_obj, nullptr);
 }
 
 TEST_F(CorePageLoadMetricsObserverTest, RapporLongPageLoad) {
-  page_load_metrics::PageLoadTiming timing;
+  page_load_metrics::mojom::PageLoadTiming timing;
+  page_load_metrics::InitPageLoadTimingForTest(&timing);
   timing.navigation_start = base::Time::FromDoubleT(1);
-  timing.paint_timing.first_contentful_paint = base::TimeDelta::FromSeconds(40);
+  timing.paint_timing->first_contentful_paint =
+      base::TimeDelta::FromSeconds(40);
   PopulateRequiredTimingFields(&timing);
   NavigateAndCommit(GURL(kDefaultTestUrl));
   SimulateTimingUpdate(timing);
 
   // Navigate again to force logging RAPPOR.
   NavigateAndCommit(GURL(kDefaultTestUrl2));
   rappor::TestSample::Shadow* sample_obj =
       rappor_tester_.GetRecordedSampleForMetric(
           internal::kRapporMetricsNameCoarseTiming);
   const auto& string_it = sample_obj->string_fields.find("Domain");
   EXPECT_NE(string_it, sample_obj->string_fields.end());
   EXPECT_EQ(rappor::GetDomainAndRegistrySampleFromGURL(GURL(kDefaultTestUrl)),
             string_it->second);
 
   const auto& flag_it = sample_obj->flag_fields.find("IsSlow");
   EXPECT_NE(flag_it, sample_obj->flag_fields.end());
   EXPECT_EQ(1u, flag_it->second);
 }
 
 TEST_F(CorePageLoadMetricsObserverTest, RapporQuickPageLoad) {
-  page_load_metrics::PageLoadTiming timing;
+  page_load_metrics::mojom::PageLoadTiming timing;
+  page_load_metrics::InitPageLoadTimingForTest(&timing);
   timing.navigation_start = base::Time::FromDoubleT(1);
-  timing.paint_timing.first_contentful_paint = base::TimeDelta::FromSeconds(1);
+  timing.paint_timing->first_contentful_paint = base::TimeDelta::FromSeconds(1);
   PopulateRequiredTimingFields(&timing);
 
   NavigateAndCommit(GURL(kDefaultTestUrl));
   SimulateTimingUpdate(timing);
 
   // Navigate again to force logging RAPPOR.
   NavigateAndCommit(GURL(kDefaultTestUrl2));
   rappor::TestSample::Shadow* sample_obj =
       rappor_tester_.GetRecordedSampleForMetric(
           internal::kRapporMetricsNameCoarseTiming);
   const auto& string_it = sample_obj->string_fields.find("Domain");
   EXPECT_NE(string_it, sample_obj->string_fields.end());
   EXPECT_EQ(rappor::GetDomainAndRegistrySampleFromGURL(GURL(kDefaultTestUrl)),
             string_it->second);
 
   const auto& flag_it = sample_obj->flag_fields.find("IsSlow");
   EXPECT_NE(flag_it, sample_obj->flag_fields.end());
   EXPECT_EQ(0u, flag_it->second);
 }
 
 TEST_F(CorePageLoadMetricsObserverTest, Reload) {
-  page_load_metrics::PageLoadTiming timing;
+  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(5);
-  timing.paint_timing.first_contentful_paint =
+  timing.parse_timing->parse_start = base::TimeDelta::FromMilliseconds(5);
+  timing.paint_timing->first_contentful_paint =
       base::TimeDelta::FromMilliseconds(10);
   PopulateRequiredTimingFields(&timing);
 
   GURL url(kDefaultTestUrl);
   NavigateWithPageTransitionAndCommit(url, ui::PAGE_TRANSITION_RELOAD);
   SimulateTimingUpdate(timing);
 
   page_load_metrics::ExtraRequestCompleteInfo resources[] = {
       // Cached request.
 
@@ skipping 19 matching lines @@
       cache_bytes += request.raw_body_bytes;
     }
   }
 
   NavigateToUntrackedUrl();
 
   histogram_tester().ExpectTotalCount(
       internal::kHistogramLoadTypeFirstContentfulPaintReload, 1);
   histogram_tester().ExpectBucketCount(
       internal::kHistogramLoadTypeFirstContentfulPaintReload,
-      timing.paint_timing.first_contentful_paint.value().InMilliseconds(), 1);
+      timing.paint_timing->first_contentful_paint.value().InMilliseconds(), 1);
   histogram_tester().ExpectTotalCount(
       internal::kHistogramLoadTypeFirstContentfulPaintForwardBack, 0);
   histogram_tester().ExpectTotalCount(
       internal::kHistogramLoadTypeFirstContentfulPaintNewNavigation, 0);
   histogram_tester().ExpectTotalCount(
       internal::kHistogramLoadTypeParseStartReload, 1);
   histogram_tester().ExpectBucketCount(
       internal::kHistogramLoadTypeParseStartReload,
-      timing.parse_timing.parse_start.value().InMilliseconds(), 1);
+      timing.parse_timing->parse_start.value().InMilliseconds(), 1);
   histogram_tester().ExpectTotalCount(
       internal::kHistogramLoadTypeParseStartForwardBack, 0);
   histogram_tester().ExpectTotalCount(
       internal::kHistogramLoadTypeParseStartNewNavigation, 0);
 
   histogram_tester().ExpectUniqueSample(
       internal::kHistogramLoadTypeNetworkBytesReload,
       static_cast<int>((network_bytes) / 1024), 1);
   histogram_tester().ExpectTotalCount(
       internal::kHistogramLoadTypeNetworkBytesForwardBack, 0);
@@ skipping 11 matching lines @@
   histogram_tester().ExpectUniqueSample(
       internal::kHistogramLoadTypeTotalBytesReload,
       static_cast<int>((network_bytes + cache_bytes) / 1024), 1);
   histogram_tester().ExpectTotalCount(
       internal::kHistogramLoadTypeTotalBytesForwardBack, 0);
   histogram_tester().ExpectTotalCount(
       internal::kHistogramLoadTypeTotalBytesNewNavigation, 0);
 }
 
 TEST_F(CorePageLoadMetricsObserverTest, ForwardBack) {
-  page_load_metrics::PageLoadTiming timing;
+  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(5);
-  timing.paint_timing.first_contentful_paint =
+  timing.parse_timing->parse_start = base::TimeDelta::FromMilliseconds(5);
+  timing.paint_timing->first_contentful_paint =
       base::TimeDelta::FromMilliseconds(10);
   PopulateRequiredTimingFields(&timing);
 
   GURL url(kDefaultTestUrl);
   // Back navigations to a page that was reloaded report a main transition type
   // of PAGE_TRANSITION_RELOAD with a PAGE_TRANSITION_FORWARD_BACK
   // modifier. This test verifies that when we encounter such a page, we log it
   // as a forward/back navigation.
   NavigateWithPageTransitionAndCommit(
       url, ui::PageTransitionFromInt(ui::PAGE_TRANSITION_RELOAD |
@@ skipping 26 matching lines @@
   }
 
   NavigateToUntrackedUrl();
 
   histogram_tester().ExpectTotalCount(
       internal::kHistogramLoadTypeFirstContentfulPaintReload, 0);
   histogram_tester().ExpectTotalCount(
       internal::kHistogramLoadTypeFirstContentfulPaintForwardBack, 1);
   histogram_tester().ExpectBucketCount(
       internal::kHistogramLoadTypeFirstContentfulPaintForwardBack,
-      timing.paint_timing.first_contentful_paint.value().InMilliseconds(), 1);
+      timing.paint_timing->first_contentful_paint.value().InMilliseconds(), 1);
   histogram_tester().ExpectTotalCount(
       internal::kHistogramLoadTypeFirstContentfulPaintNewNavigation, 0);
   histogram_tester().ExpectTotalCount(
       internal::kHistogramLoadTypeParseStartReload, 0);
   histogram_tester().ExpectTotalCount(
       internal::kHistogramLoadTypeParseStartForwardBack, 1);
   histogram_tester().ExpectBucketCount(
       internal::kHistogramLoadTypeParseStartForwardBack,
-      timing.parse_timing.parse_start.value().InMilliseconds(), 1);
+      timing.parse_timing->parse_start.value().InMilliseconds(), 1);
   histogram_tester().ExpectTotalCount(
       internal::kHistogramLoadTypeParseStartNewNavigation, 0);
 
   histogram_tester().ExpectUniqueSample(
       internal::kHistogramLoadTypeNetworkBytesForwardBack,
       static_cast<int>((network_bytes) / 1024), 1);
   histogram_tester().ExpectTotalCount(
       internal::kHistogramLoadTypeNetworkBytesNewNavigation, 0);
   histogram_tester().ExpectTotalCount(
       internal::kHistogramLoadTypeNetworkBytesReload, 0);
 
   histogram_tester().ExpectUniqueSample(
       internal::kHistogramLoadTypeCacheBytesForwardBack,
       static_cast<int>((cache_bytes) / 1024), 1);
   histogram_tester().ExpectTotalCount(
       internal::kHistogramLoadTypeCacheBytesNewNavigation, 0);
   histogram_tester().ExpectTotalCount(
       internal::kHistogramLoadTypeCacheBytesReload, 0);
 
   histogram_tester().ExpectUniqueSample(
       internal::kHistogramLoadTypeTotalBytesForwardBack,
       static_cast<int>((network_bytes + cache_bytes) / 1024), 1);
   histogram_tester().ExpectTotalCount(
       internal::kHistogramLoadTypeTotalBytesNewNavigation, 0);
   histogram_tester().ExpectTotalCount(
       internal::kHistogramLoadTypeTotalBytesReload, 0);
 }
 
 TEST_F(CorePageLoadMetricsObserverTest, NewNavigation) {
-  page_load_metrics::PageLoadTiming timing;
+  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(5);
-  timing.paint_timing.first_contentful_paint =
+  timing.parse_timing->parse_start = base::TimeDelta::FromMilliseconds(5);
+  timing.paint_timing->first_contentful_paint =
       base::TimeDelta::FromMilliseconds(10);
   PopulateRequiredTimingFields(&timing);
 
   GURL url(kDefaultTestUrl);
   NavigateWithPageTransitionAndCommit(url, ui::PAGE_TRANSITION_LINK);
   SimulateTimingUpdate(timing);
 
   page_load_metrics::ExtraRequestCompleteInfo resources[] = {
       // Cached request.
       {GURL(), -1 /* frame_tree_node_id */, true /*was_cached*/,
@@ skipping 22 matching lines @@
   NavigateToUntrackedUrl();
 
   histogram_tester().ExpectTotalCount(
       internal::kHistogramLoadTypeFirstContentfulPaintReload, 0);
   histogram_tester().ExpectTotalCount(
       internal::kHistogramLoadTypeFirstContentfulPaintForwardBack, 0);
   histogram_tester().ExpectTotalCount(
       internal::kHistogramLoadTypeFirstContentfulPaintNewNavigation, 1);
   histogram_tester().ExpectBucketCount(
       internal::kHistogramLoadTypeFirstContentfulPaintNewNavigation,
-      timing.paint_timing.first_contentful_paint.value().InMilliseconds(), 1);
+      timing.paint_timing->first_contentful_paint.value().InMilliseconds(), 1);
   histogram_tester().ExpectTotalCount(
       internal::kHistogramLoadTypeParseStartReload, 0);
   histogram_tester().ExpectTotalCount(
       internal::kHistogramLoadTypeParseStartForwardBack, 0);
   histogram_tester().ExpectTotalCount(
       internal::kHistogramLoadTypeParseStartNewNavigation, 1);
   histogram_tester().ExpectBucketCount(
       internal::kHistogramLoadTypeParseStartNewNavigation,
-      timing.parse_timing.parse_start.value().InMilliseconds(), 1);
+      timing.parse_timing->parse_start.value().InMilliseconds(), 1);
 
   histogram_tester().ExpectUniqueSample(
       internal::kHistogramLoadTypeNetworkBytesNewNavigation,
       static_cast<int>((network_bytes) / 1024), 1);
   histogram_tester().ExpectTotalCount(
       internal::kHistogramLoadTypeNetworkBytesForwardBack, 0);
   histogram_tester().ExpectTotalCount(
       internal::kHistogramLoadTypeNetworkBytesReload, 0);
 
   histogram_tester().ExpectUniqueSample(
@@ skipping 21 matching lines @@
   histogram_tester().ExpectTotalCount(internal::kHistogramCacheBytes, 1);
   histogram_tester().ExpectTotalCount(
       internal::kHistogramTotalCompletedResources, 1);
   histogram_tester().ExpectTotalCount(
       internal::kHistogramNetworkCompletedResources, 1);
   histogram_tester().ExpectTotalCount(
       internal::kHistogramCacheCompletedResources, 1);
 }
 
 TEST_F(CorePageLoadMetricsObserverTest, FirstMeaningfulPaint) {
-  page_load_metrics::PageLoadTiming timing;
+  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(5);
-  timing.paint_timing.first_meaningful_paint =
+  timing.parse_timing->parse_start = base::TimeDelta::FromMilliseconds(5);
+  timing.paint_timing->first_meaningful_paint =
       base::TimeDelta::FromMilliseconds(10);
   PopulateRequiredTimingFields(&timing);
 
   NavigateAndCommit(GURL(kDefaultTestUrl));
   SimulateTimingUpdate(timing);
   NavigateAndCommit(GURL(kDefaultTestUrl2));
 
   histogram_tester().ExpectTotalCount(
       internal::kHistogramFirstMeaningfulPaint, 1);
   histogram_tester().ExpectTotalCount(
       internal::kHistogramParseStartToFirstMeaningfulPaint, 1);
   histogram_tester().ExpectBucketCount(
       internal::kHistogramFirstMeaningfulPaintStatus,
       internal::FIRST_MEANINGFUL_PAINT_RECORDED, 1);
 }
 
 TEST_F(CorePageLoadMetricsObserverTest, FirstMeaningfulPaintAfterInteraction) {
-  page_load_metrics::PageLoadTiming timing;
+  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(5);
-  timing.paint_timing.first_paint = base::TimeDelta::FromMilliseconds(10);
+  timing.parse_timing->parse_start = base::TimeDelta::FromMilliseconds(5);
+  timing.paint_timing->first_paint = base::TimeDelta::FromMilliseconds(10);
   PopulateRequiredTimingFields(&timing);
 
   NavigateAndCommit(GURL(kDefaultTestUrl));
   SimulateTimingUpdate(timing);
 
   blink::WebMouseEvent mouse_event(blink::WebInputEvent::kMouseDown,
                                    blink::WebInputEvent::kNoModifiers,
                                    blink::WebInputEvent::kTimeStampForTesting);
   SimulateInputEvent(mouse_event);
 
-  timing.paint_timing.first_meaningful_paint =
+  timing.paint_timing->first_meaningful_paint =
       base::TimeDelta::FromMilliseconds(1000);
   PopulateRequiredTimingFields(&timing);
   SimulateTimingUpdate(timing);
 
   NavigateAndCommit(GURL(kDefaultTestUrl2));
 
   histogram_tester().ExpectTotalCount(
       internal::kHistogramFirstMeaningfulPaint, 0);
   histogram_tester().ExpectTotalCount(
       internal::kHistogramParseStartToFirstMeaningfulPaint, 0);
   histogram_tester().ExpectBucketCount(
       internal::kHistogramFirstMeaningfulPaintStatus,
       internal::FIRST_MEANINGFUL_PAINT_USER_INTERACTION_BEFORE_FMP, 1);
 }