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

chrome/browser/page_load_metrics/observers/from_gws_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/from_gws_page_load_metrics_observer.h"
 
 #include "base/macros.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 "third_party/WebKit/public/platform/WebMouseEvent.h"
 
 namespace {
 const char kExampleUrl[] = "http://www.example.com/";
 const char kGoogleSearchResultsUrl[] = "https://www.google.com/webhp?q=d";
 }  // namespace
 
 class FromGWSPageLoadMetricsObserverTest
     : public page_load_metrics::PageLoadMetricsObserverTestHarness {
  public:
   void RegisterObservers(page_load_metrics::PageLoadTracker* tracker) override {
     FromGWSPageLoadMetricsObserver* observer =
         new FromGWSPageLoadMetricsObserver();
     tracker->AddObserver(base::WrapUnique(observer));
   }
 
   void SimulateTimingWithoutPaint() {
-    page_load_metrics::PageLoadTiming timing;
+    page_load_metrics::mojom::PageLoadTiming timing;
+    page_load_metrics::InitPageLoadTimingForTest(&timing);
     timing.navigation_start = base::Time::FromDoubleT(1);
     SimulateTimingUpdate(timing);
   }
 
   void SimulateTimingWithFirstPaint() {
-    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_paint = base::TimeDelta::FromMilliseconds(0);
+    timing.paint_timing->first_paint = base::TimeDelta::FromMilliseconds(0);
     PopulateRequiredTimingFields(&timing);
     SimulateTimingUpdate(timing);
   }
 
   void SimulateMouseEvent() {
     blink::WebMouseEvent mouse_event(
         blink::WebInputEvent::kMouseDown, blink::WebInputEvent::kNoModifiers,
         blink::WebInputEvent::kTimeStampForTesting);
     mouse_event.button = blink::WebMouseEvent::Button::kLeft;
     mouse_event.SetPositionInWidget(7, 7);
     mouse_event.click_count = 1;
     SimulateInputEvent(mouse_event);
   }
 };
 
 class FromGWSPageLoadMetricsLoggerTest : public testing::Test {};
 
 TEST_F(FromGWSPageLoadMetricsObserverTest, NoMetrics) {
   histogram_tester().ExpectTotalCount(internal::kHistogramFromGWSFirstTextPaint,
                                       0);
 }
 
 TEST_F(FromGWSPageLoadMetricsObserverTest, NoPreviousCommittedUrl) {
-  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_text_paint = base::TimeDelta::FromMilliseconds(1);
+  timing.paint_timing->first_text_paint = base::TimeDelta::FromMilliseconds(1);
   PopulateRequiredTimingFields(&timing);
   NavigateAndCommit(GURL(kExampleUrl));
 
   SimulateTimingUpdate(timing);
 
   // Navigate again to force logging.
   NavigateAndCommit(GURL("http://www.final.com"));
   histogram_tester().ExpectTotalCount(internal::kHistogramFromGWSFirstTextPaint,
                                       0);
 }
 
 TEST_F(FromGWSPageLoadMetricsObserverTest, NonSearchPreviousCommittedUrl) {
-  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_text_paint = base::TimeDelta::FromMilliseconds(1);
+  timing.paint_timing->first_text_paint = base::TimeDelta::FromMilliseconds(1);
   PopulateRequiredTimingFields(&timing);
   NavigateAndCommit(GURL("http://www.other.com"));
   NavigateAndCommit(GURL(kExampleUrl));
 
   SimulateTimingUpdate(timing);
 
   // Navigate again to force logging.
   NavigateAndCommit(GURL("http://www.final.com"));
   histogram_tester().ExpectTotalCount(internal::kHistogramFromGWSFirstTextPaint,
                                       0);
 }
 
 TEST_F(FromGWSPageLoadMetricsObserverTest,
        GoogleNonSearchPreviousCommittedUrl1) {
-  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_text_paint = base::TimeDelta::FromMilliseconds(1);
+  timing.paint_timing->first_text_paint = base::TimeDelta::FromMilliseconds(1);
   PopulateRequiredTimingFields(&timing);
   NavigateAndCommit(GURL("https://www.google.com/"));
   NavigateAndCommit(GURL(kExampleUrl));
 
   SimulateTimingUpdate(timing);
 
   // Navigate again to force logging.
   NavigateAndCommit(GURL("http://www.final.com"));
   histogram_tester().ExpectTotalCount(internal::kHistogramFromGWSFirstTextPaint,
                                       0);
 }
 
 TEST_F(FromGWSPageLoadMetricsObserverTest,
        GoogleNonSearchPreviousCommittedUrl2) {
-  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_text_paint = base::TimeDelta::FromMilliseconds(1);
+  timing.paint_timing->first_text_paint = base::TimeDelta::FromMilliseconds(1);
   PopulateRequiredTimingFields(&timing);
   // Navigation from /search, but missing a query string, so can't have been a
   // search results page.
   NavigateAndCommit(GURL("https://www.google.com/search?a=b&c=d"));
   NavigateAndCommit(GURL(kExampleUrl));
 
   SimulateTimingUpdate(timing);
 
   // Navigate again to force logging.
   NavigateAndCommit(GURL("http://www.final.com"));
   histogram_tester().ExpectTotalCount(internal::kHistogramFromGWSFirstTextPaint,
                                       0);
 }
 
 TEST_F(FromGWSPageLoadMetricsObserverTest, SearchPreviousCommittedUrl1) {
-  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(10);
-  timing.paint_timing.first_paint = base::TimeDelta::FromMilliseconds(20);
-  timing.paint_timing.first_contentful_paint =
+  timing.parse_timing->parse_start = base::TimeDelta::FromMilliseconds(10);
+  timing.paint_timing->first_paint = base::TimeDelta::FromMilliseconds(20);
+  timing.paint_timing->first_contentful_paint =
       base::TimeDelta::FromMilliseconds(40);
-  timing.paint_timing.first_text_paint = base::TimeDelta::FromMilliseconds(80);
-  timing.paint_timing.first_image_paint =
+  timing.paint_timing->first_text_paint = base::TimeDelta::FromMilliseconds(80);
+  timing.paint_timing->first_image_paint =
       base::TimeDelta::FromMilliseconds(160);
-  timing.parse_timing.parse_stop = base::TimeDelta::FromMilliseconds(320);
-  timing.document_timing.dom_content_loaded_event_start =
+  timing.parse_timing->parse_stop = base::TimeDelta::FromMilliseconds(320);
+  timing.document_timing->dom_content_loaded_event_start =
       base::TimeDelta::FromMilliseconds(640);
-  timing.document_timing.load_event_start =
+  timing.document_timing->load_event_start =
       base::TimeDelta::FromMilliseconds(1280);
   PopulateRequiredTimingFields(&timing);
   NavigateAndCommit(GURL("https://www.google.com/webhp?q=test"));
   NavigateAndCommit(GURL(kExampleUrl));
 
   SimulateTimingUpdate(timing);
 
   // Navigate again to force logging.
   NavigateAndCommit(GURL("http://www.final.com"));
 
   histogram_tester().ExpectTotalCount(internal::kHistogramFromGWSParseStart, 1);
   histogram_tester().ExpectBucketCount(
       internal::kHistogramFromGWSParseStart,
-      timing.parse_timing.parse_start.value().InMilliseconds(), 1);
+      timing.parse_timing->parse_start.value().InMilliseconds(), 1);
 
   histogram_tester().ExpectTotalCount(internal::kHistogramFromGWSFirstPaint, 1);
   histogram_tester().ExpectBucketCount(
       internal::kHistogramFromGWSFirstPaint,
-      timing.paint_timing.first_paint.value().InMilliseconds(), 1);
+      timing.paint_timing->first_paint.value().InMilliseconds(), 1);
 
   histogram_tester().ExpectTotalCount(
       internal::kHistogramFromGWSFirstContentfulPaint, 1);
   histogram_tester().ExpectBucketCount(
       internal::kHistogramFromGWSFirstContentfulPaint,
-      timing.paint_timing.first_contentful_paint.value().InMilliseconds(), 1);
+      timing.paint_timing->first_contentful_paint.value().InMilliseconds(), 1);
 
   histogram_tester().ExpectTotalCount(
       internal::kHistogramFromGWSParseStartToFirstContentfulPaint, 1);
   histogram_tester().ExpectBucketCount(
       internal::kHistogramFromGWSParseStartToFirstContentfulPaint,
-      (timing.paint_timing.first_contentful_paint.value() -
-       timing.parse_timing.parse_start.value())
+      (timing.paint_timing->first_contentful_paint.value() -
+       timing.parse_timing->parse_start.value())
           .InMilliseconds(),
       1);
 
   histogram_tester().ExpectTotalCount(internal::kHistogramFromGWSFirstTextPaint,
                                       1);
   histogram_tester().ExpectBucketCount(
       internal::kHistogramFromGWSFirstTextPaint,
-      timing.paint_timing.first_text_paint.value().InMilliseconds(), 1);
+      timing.paint_timing->first_text_paint.value().InMilliseconds(), 1);
 
   histogram_tester().ExpectTotalCount(
       internal::kHistogramFromGWSFirstImagePaint, 1);
   histogram_tester().ExpectBucketCount(
       internal::kHistogramFromGWSFirstImagePaint,
-      timing.paint_timing.first_image_paint.value().InMilliseconds(), 1);
+      timing.paint_timing->first_image_paint.value().InMilliseconds(), 1);
 
   histogram_tester().ExpectTotalCount(internal::kHistogramFromGWSParseDuration,
                                       1);
-  histogram_tester().ExpectBucketCount(internal::kHistogramFromGWSParseDuration,
-                                       (timing.parse_timing.parse_stop.value() -
-                                        timing.parse_timing.parse_start.value())
-                                           .InMilliseconds(),
-                                       1);
+  histogram_tester().ExpectBucketCount(
+      internal::kHistogramFromGWSParseDuration,
+      (timing.parse_timing->parse_stop.value() -
+       timing.parse_timing->parse_start.value())
+          .InMilliseconds(),
+      1);
 
   histogram_tester().ExpectTotalCount(
       internal::kHistogramFromGWSDomContentLoaded, 1);
   histogram_tester().ExpectBucketCount(
       internal::kHistogramFromGWSDomContentLoaded,
-      timing.document_timing.dom_content_loaded_event_start.value()
+      timing.document_timing->dom_content_loaded_event_start.value()
           .InMilliseconds(),
       1);
 
   histogram_tester().ExpectTotalCount(internal::kHistogramFromGWSLoad, 1);
   histogram_tester().ExpectBucketCount(
       internal::kHistogramFromGWSLoad,
-      timing.document_timing.load_event_start.value().InMilliseconds(), 1);
+      timing.document_timing->load_event_start.value().InMilliseconds(), 1);
 }
 
 TEST_F(FromGWSPageLoadMetricsObserverTest, SearchPreviousCommittedUrl2) {
-  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_text_paint = base::TimeDelta::FromMilliseconds(1);
+  timing.paint_timing->first_text_paint = base::TimeDelta::FromMilliseconds(1);
   PopulateRequiredTimingFields(&timing);
   NavigateAndCommit(GURL("https://www.google.com/#q=test"));
   NavigateAndCommit(GURL(kExampleUrl));
 
   SimulateTimingUpdate(timing);
 
   // Navigate again to force logging.
   NavigateAndCommit(GURL("http://www.final.com"));
   histogram_tester().ExpectTotalCount(internal::kHistogramFromGWSFirstTextPaint,
                                       1);
   histogram_tester().ExpectBucketCount(
       internal::kHistogramFromGWSFirstTextPaint,
-      timing.paint_timing.first_text_paint.value().InMilliseconds(), 1);
+      timing.paint_timing->first_text_paint.value().InMilliseconds(), 1);
 }
 
 TEST_F(FromGWSPageLoadMetricsObserverTest, SearchPreviousCommittedUrl3) {
-  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_text_paint = base::TimeDelta::FromMilliseconds(1);
+  timing.paint_timing->first_text_paint = base::TimeDelta::FromMilliseconds(1);
   PopulateRequiredTimingFields(&timing);
   NavigateAndCommit(GURL("https://www.google.com/webhp#q=test"));
   NavigateAndCommit(GURL(kExampleUrl));
 
   SimulateTimingUpdate(timing);
 
   // Navigate again to force logging.
   NavigateAndCommit(GURL("http://www.final.com"));
   histogram_tester().ExpectTotalCount(internal::kHistogramFromGWSFirstTextPaint,
                                       1);
   histogram_tester().ExpectBucketCount(
       internal::kHistogramFromGWSFirstTextPaint,
-      timing.paint_timing.first_text_paint.value().InMilliseconds(), 1);
+      timing.paint_timing->first_text_paint.value().InMilliseconds(), 1);
 }
 
 TEST_F(FromGWSPageLoadMetricsObserverTest, SearchPreviousCommittedUrl4) {
-  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_text_paint = base::TimeDelta::FromMilliseconds(1);
+  timing.paint_timing->first_text_paint = base::TimeDelta::FromMilliseconds(1);
   PopulateRequiredTimingFields(&timing);
   NavigateAndCommit(GURL("https://www.google.co.uk/search#q=test"));
   NavigateAndCommit(GURL(kExampleUrl));
 
   SimulateTimingUpdate(timing);
 
   // Navigate again to force logging.
   NavigateAndCommit(GURL("http://www.final.com"));
   histogram_tester().ExpectTotalCount(internal::kHistogramFromGWSFirstTextPaint,
                                       1);
   histogram_tester().ExpectBucketCount(
       internal::kHistogramFromGWSFirstTextPaint,
-      timing.paint_timing.first_text_paint.value().InMilliseconds(), 1);
+      timing.paint_timing->first_text_paint.value().InMilliseconds(), 1);
 }
 
 TEST_F(FromGWSPageLoadMetricsObserverTest, SearchToNonSearchToOtherPage) {
-  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_text_paint = base::TimeDelta::FromMilliseconds(1);
-  page_load_metrics::PageLoadTiming timing2;
+  timing.paint_timing->first_text_paint = base::TimeDelta::FromMilliseconds(1);
+  page_load_metrics::mojom::PageLoadTiming timing2;
+  page_load_metrics::InitPageLoadTimingForTest(&timing2);
   timing2.navigation_start = base::Time::FromDoubleT(2);
-  timing2.paint_timing.first_text_paint =
+  timing2.paint_timing->first_text_paint =
       base::TimeDelta::FromMilliseconds(100);
   PopulateRequiredTimingFields(&timing);
   PopulateRequiredTimingFields(&timing2);
   NavigateAndCommit(GURL("https://www.google.co.uk/search#q=test"));
   NavigateAndCommit(GURL(kExampleUrl));
   SimulateTimingUpdate(timing);
   NavigateAndCommit(GURL("http://www.example.com/other"));
   SimulateTimingUpdate(timing2);
 
   // Navigate again to force logging. We expect to log timing for the page
   // navigated from search, but not for the page navigated from that page.
   NavigateAndCommit(GURL("http://www.final.com"));
   histogram_tester().ExpectTotalCount(internal::kHistogramFromGWSFirstTextPaint,
                                       1);
   histogram_tester().ExpectBucketCount(
       internal::kHistogramFromGWSFirstTextPaint,
-      timing.paint_timing.first_text_paint.value().InMilliseconds(), 1);
+      timing.paint_timing->first_text_paint.value().InMilliseconds(), 1);
 }
 
 TEST_F(FromGWSPageLoadMetricsObserverTest, SearchToNonSearchToSearch) {
-  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_text_paint = base::TimeDelta::FromMilliseconds(1);
-  page_load_metrics::PageLoadTiming timing2;
+  timing.paint_timing->first_text_paint = base::TimeDelta::FromMilliseconds(1);
+  page_load_metrics::mojom::PageLoadTiming timing2;
+  page_load_metrics::InitPageLoadTimingForTest(&timing2);
   timing2.navigation_start = base::Time::FromDoubleT(2);
-  timing2.paint_timing.first_text_paint =
+  timing2.paint_timing->first_text_paint =
       base::TimeDelta::FromMilliseconds(100);
   PopulateRequiredTimingFields(&timing);
   PopulateRequiredTimingFields(&timing2);
   NavigateAndCommit(GURL("https://www.google.co.uk/search#q=test"));
   NavigateAndCommit(GURL(kExampleUrl));
   SimulateTimingUpdate(timing);
   NavigateAndCommit(GURL("https://www.google.co.uk/search#q=test"));
   SimulateTimingUpdate(timing2);
 
   // Navigate again to force logging. We expect to log timing for the page
   // navigated from search, but not for the search page we navigated to.
   NavigateAndCommit(GURL("http://www.final.com"));
   histogram_tester().ExpectTotalCount(internal::kHistogramFromGWSFirstTextPaint,
                                       1);
   histogram_tester().ExpectBucketCount(
       internal::kHistogramFromGWSFirstTextPaint,
-      timing.paint_timing.first_text_paint.value().InMilliseconds(), 1);
+      timing.paint_timing->first_text_paint.value().InMilliseconds(), 1);
 }
 
 TEST_F(FromGWSPageLoadMetricsObserverTest,
        SearchToNonSearchToSearchToNonSearch) {
-  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_text_paint = base::TimeDelta::FromMilliseconds(1);
-  page_load_metrics::PageLoadTiming timing2;
+  timing.paint_timing->first_text_paint = base::TimeDelta::FromMilliseconds(1);
+  page_load_metrics::mojom::PageLoadTiming timing2;
+  page_load_metrics::InitPageLoadTimingForTest(&timing2);
   timing2.navigation_start = base::Time::FromDoubleT(2);
-  timing2.paint_timing.first_text_paint =
+  timing2.paint_timing->first_text_paint =
       base::TimeDelta::FromMilliseconds(100);
-  page_load_metrics::PageLoadTiming timing3;
+  page_load_metrics::mojom::PageLoadTiming timing3;
+  page_load_metrics::InitPageLoadTimingForTest(&timing3);
   timing3.navigation_start = base::Time::FromDoubleT(3);
-  timing3.paint_timing.first_text_paint =
+  timing3.paint_timing->first_text_paint =
       base::TimeDelta::FromMilliseconds(1000);
   PopulateRequiredTimingFields(&timing);
   PopulateRequiredTimingFields(&timing2);
   PopulateRequiredTimingFields(&timing3);
   NavigateAndCommit(GURL("https://www.google.co.uk/search#q=test"));
   NavigateAndCommit(GURL(kExampleUrl));
   SimulateTimingUpdate(timing);
   NavigateAndCommit(GURL("https://www.google.co.uk/search#q=test"));
   SimulateTimingUpdate(timing2);
   NavigateAndCommit(GURL(kExampleUrl));
   SimulateTimingUpdate(timing3);
 
   // Navigate again to force logging. We expect to log timing for both pages
   // navigated from search, but not for the search pages we navigated to.
   NavigateAndCommit(GURL("http://www.final.com"));
   histogram_tester().ExpectTotalCount(internal::kHistogramFromGWSFirstTextPaint,
                                       2);
   histogram_tester().ExpectBucketCount(
       internal::kHistogramFromGWSFirstTextPaint,
-      timing.paint_timing.first_text_paint.value().InMilliseconds(), 1);
+      timing.paint_timing->first_text_paint.value().InMilliseconds(), 1);
   histogram_tester().ExpectBucketCount(
       internal::kHistogramFromGWSFirstTextPaint,
-      timing3.paint_timing.first_text_paint.value().InMilliseconds(), 1);
+      timing3.paint_timing->first_text_paint.value().InMilliseconds(), 1);
 }
 
 TEST_F(FromGWSPageLoadMetricsObserverTest,
        SearchToNonSearchToSearchToNonSearchBackgrounded) {
-  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_text_paint = base::TimeDelta::FromMilliseconds(1);
-  page_load_metrics::PageLoadTiming timing2;
+  timing.paint_timing->first_text_paint = base::TimeDelta::FromMilliseconds(1);
+  page_load_metrics::mojom::PageLoadTiming timing2;
+  page_load_metrics::InitPageLoadTimingForTest(&timing2);
   timing2.navigation_start = base::Time::FromDoubleT(2);
-  timing2.paint_timing.first_text_paint =
+  timing2.paint_timing->first_text_paint =
       base::TimeDelta::FromMilliseconds(100);
-  page_load_metrics::PageLoadTiming timing3;
+  page_load_metrics::mojom::PageLoadTiming timing3;
+  page_load_metrics::InitPageLoadTimingForTest(&timing3);
   timing3.navigation_start = base::Time::FromDoubleT(3);
-  timing3.paint_timing.first_text_paint =
+  timing3.paint_timing->first_text_paint =
       base::TimeDelta::FromMilliseconds(1000);
   PopulateRequiredTimingFields(&timing);
   PopulateRequiredTimingFields(&timing2);
   PopulateRequiredTimingFields(&timing3);
   NavigateAndCommit(GURL("https://www.google.co.uk/search#q=test"));
   NavigateAndCommit(GURL(kExampleUrl));
   SimulateTimingUpdate(timing);
   NavigateAndCommit(GURL("https://www.google.co.uk/search#q=test"));
   web_contents()->WasHidden();
   SimulateTimingUpdate(timing2);
   NavigateAndCommit(GURL(kExampleUrl));
   SimulateTimingUpdate(timing3);
 
   // Navigate again to force logging. We expect to log timing for the first page
   // navigated from search, but not the second since it was backgrounded.
   NavigateAndCommit(GURL("http://www.final.com"));
   histogram_tester().ExpectTotalCount(internal::kHistogramFromGWSFirstTextPaint,
                                       1);
   histogram_tester().ExpectBucketCount(
       internal::kHistogramFromGWSFirstTextPaint,
-      timing.paint_timing.first_text_paint.value().InMilliseconds(), 1);
+      timing.paint_timing->first_text_paint.value().InMilliseconds(), 1);
 }
 
 TEST_F(FromGWSPageLoadMetricsObserverTest,
        SearchRedirectorPreviousCommittedUrl) {
-  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_text_paint = base::TimeDelta::FromMilliseconds(1);
+  timing.paint_timing->first_text_paint = base::TimeDelta::FromMilliseconds(1);
   PopulateRequiredTimingFields(&timing);
   NavigateAndCommit(GURL("https://www.google.com/search#q=test"));
   NavigateAndCommit(GURL("https://www.google.com/url?source=web"));
   NavigateAndCommit(GURL(kExampleUrl));
 
   SimulateTimingUpdate(timing);
 
   // Navigate again to force logging.
   NavigateAndCommit(GURL("http://www.final.com"));
   histogram_tester().ExpectTotalCount(internal::kHistogramFromGWSFirstTextPaint,
                                       1);
   histogram_tester().ExpectBucketCount(
       internal::kHistogramFromGWSFirstTextPaint,
-      timing.paint_timing.first_text_paint.value().InMilliseconds(), 1);
+      timing.paint_timing->first_text_paint.value().InMilliseconds(), 1);
 }
 
 TEST_F(FromGWSPageLoadMetricsObserverTest,
        NonSearchRedirectorPreviousCommittedUrl) {
-  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_text_paint = base::TimeDelta::FromMilliseconds(1);
+  timing.paint_timing->first_text_paint = base::TimeDelta::FromMilliseconds(1);
   PopulateRequiredTimingFields(&timing);
   NavigateAndCommit(GURL("https://www.google.com/webhp?q=test"));
   NavigateAndCommit(GURL("https://www.google.com/url?a=b&c=d"));
   NavigateAndCommit(GURL(kExampleUrl));
 
   SimulateTimingUpdate(timing);
 
   // Navigate again to force logging.
   NavigateAndCommit(GURL("http://www.final.com"));
   histogram_tester().ExpectTotalCount(internal::kHistogramFromGWSFirstTextPaint,
                                       0);
 }
 
 TEST_F(FromGWSPageLoadMetricsObserverTest,
        SearchPreviousCommittedUrlBackgroundLater) {
-  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_text_paint = base::TimeDelta::FromMicroseconds(1);
+  timing.paint_timing->first_text_paint = base::TimeDelta::FromMicroseconds(1);
   PopulateRequiredTimingFields(&timing);
 
   NavigateAndCommit(GURL("https://www.google.com/search#q=test"));
   NavigateAndCommit(GURL(kExampleUrl));
 
   web_contents()->WasHidden();
   SimulateTimingUpdate(timing);
 
   page_load_metrics::PageLoadExtraInfo info =
       GetPageLoadExtraInfoForCommittedLoad();
 
   // If the system clock is low resolution PageLoadTracker's background_time_
   // may be < timing.first_text_paint.
   if (page_load_metrics::WasStartedInForegroundOptionalEventInForeground(
-          timing.paint_timing.first_text_paint, info)) {
+          timing.paint_timing->first_text_paint, info)) {
     histogram_tester().ExpectTotalCount(
         internal::kHistogramFromGWSFirstTextPaint, 1);
     histogram_tester().ExpectBucketCount(
         internal::kHistogramFromGWSFirstTextPaint,
-        timing.paint_timing.first_text_paint.value().InMilliseconds(), 1);
+        timing.paint_timing->first_text_paint.value().InMilliseconds(), 1);
   } else {
     histogram_tester().ExpectTotalCount(
         internal::kHistogramFromGWSFirstTextPaint, 0);
   }
 }
 
 TEST_F(FromGWSPageLoadMetricsObserverTest, NewNavigationBeforeCommit) {
   NavigateAndCommit(GURL(kGoogleSearchResultsUrl));
   StartNavigation(GURL("http://example.test"));
 
@@ skipping 140 matching lines @@
 TEST_F(FromGWSPageLoadMetricsObserverTest, NoAbortNewNavigationFromAboutURL) {
   NavigateAndCommit(GURL(kGoogleSearchResultsUrl));
   NavigateAndCommit(GURL("about:blank"));
   NavigateAndCommit(GURL("https://www.example.com"));
   histogram_tester().ExpectTotalCount(
       internal::kHistogramFromGWSAbortNewNavigationBeforePaint, 0);
 }
 
 TEST_F(FromGWSPageLoadMetricsObserverTest, NoAbortNewNavigationAfterPaint) {
   NavigateAndCommit(GURL(kGoogleSearchResultsUrl));
-  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_paint = base::TimeDelta::FromMicroseconds(1);
+  timing.paint_timing->first_paint = base::TimeDelta::FromMicroseconds(1);
   PopulateRequiredTimingFields(&timing);
   NavigateAndCommit(GURL("https://example.test"));
   SimulateTimingUpdate(timing);
 
   // The test cannot assume that abort time will be > first_paint
   // (1 micro-sec). If the system clock is low resolution, PageLoadTracker's
   // abort time may be <= first_paint. In that case the histogram will be
   // logged. Thus both 0 and 1 counts of histograms are considered good.
 
   NavigateAndCommit(GURL("https://example.test2"));
@@ skipping 300 matching lines @@
       logger.ShouldLogPostCommitMetrics(GURL("https://www.google.com/about/")));
 }
 
 TEST_F(FromGWSPageLoadMetricsLoggerTest, NavigationFromSearchRedirector) {
   FromGWSPageLoadMetricsLogger logger;
   logger.SetPreviouslyCommittedUrl(
       GURL("https://www.google.com/url?source=web"));
   logger.set_navigation_initiated_via_link(true);
   ASSERT_TRUE(logger.ShouldLogPostCommitMetrics(GURL(kExampleUrl)));
 }