[Page Load Metrics] Structure PageLoadTiming.

chrome/browser/prerender/prerender_browsertest.cc

 // Copyright (c) 2012 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 <stddef.h>
 #include <deque>
 #include <set>
 #include <string>
 #include <unordered_map>
 #include <utility>
@@ skipping 3288 matching lines @@
   base::TimeTicks load_start = clock->NowTicks();
   clock->Advance(base::TimeDelta::FromSeconds(1));
   NavigateToDestURL();
 
   PrerenderPageLoadMetricsObserver observer(GetPrerenderManager(),
                                             GetActiveWebContents());
   observer.SetNavigationStartTicksForTesting(load_start);
 
   page_load_metrics::PageLoadTiming timing;
   timing.navigation_start = base::Time::FromDoubleT(1);  // Non-null time.
-  timing.first_contentful_paint = base::TimeDelta::FromMilliseconds(2654);
+  timing.paint_timing.first_contentful_paint =
+      base::TimeDelta::FromMilliseconds(2654);
   page_load_metrics::PageLoadMetricsObserverTestHarness::
       PopulateRequiredTimingFields(&timing);
   observer.OnFirstContentfulPaint(timing, GenericPageLoadExtraInfo(dest_url()));
 
   histogram_tester().ExpectTotalCount(
       "Prerender.websame_PrefetchTTFCP.Warm.Cacheable.Visible", 1);
   histogram_tester().ExpectUniqueSample(
       "Prerender.websame_PrefetchTTFCP.Warm.Cacheable.Visible", 1654, 1);
 }
 
@@ skipping 20 matching lines @@
   PrerenderTestURL(url, FINAL_STATUS_USED, 1);
   clock->Advance(base::TimeDelta::FromSeconds(1));
 
   NavigateToDestURL();
   PrerenderPageLoadMetricsObserver observer(GetPrerenderManager(),
                                             GetActiveWebContents());
   observer.SetNavigationStartTicksForTesting(load_start);
 
   page_load_metrics::PageLoadTiming timing;
   timing.navigation_start = base::Time::FromDoubleT(1);  // Non-null time.
-  timing.first_contentful_paint = base::TimeDelta::FromMilliseconds(2361);
+  timing.paint_timing.first_contentful_paint =
+      base::TimeDelta::FromMilliseconds(2361);
   page_load_metrics::PageLoadMetricsObserverTestHarness::
       PopulateRequiredTimingFields(&timing);
   observer.OnFirstContentfulPaint(timing, GenericPageLoadExtraInfo(dest_url()));
 
   histogram_tester().ExpectTotalCount(
       "Prerender.websame_PrefetchTTFCP.Warm.Cacheable.Visible", 1);
   // If the first prerender had been used, the perceived TTFCP would have been
   // under a second: 2362ms - 2 sec worth of Advance().
   histogram_tester().ExpectUniqueSample(
       "Prerender.websame_PrefetchTTFCP.Warm.Cacheable.Visible", 1361, 1);
@@ skipping 19 matching lines @@
 
   clock->Advance(base::TimeDelta::FromSeconds(1));
   NavigateToDestURL();
 
   PrerenderPageLoadMetricsObserver observer(GetPrerenderManager(),
                                             GetActiveWebContents());
   observer.SetNavigationStartTicksForTesting(load_start);
 
   page_load_metrics::PageLoadTiming timing;
   timing.navigation_start = base::Time::FromDoubleT(1);  // Non-null time.
-  timing.first_contentful_paint = base::TimeDelta::FromMilliseconds(2361);
+  timing.paint_timing.first_contentful_paint =
+      base::TimeDelta::FromMilliseconds(2361);
   page_load_metrics::PageLoadMetricsObserverTestHarness::
       PopulateRequiredTimingFields(&timing);
   observer.OnFirstContentfulPaint(timing, GenericPageLoadExtraInfo(dest_url()));
 
   histogram_tester().ExpectTotalCount(
       "Prerender.websame_PrefetchTTFCP.Warm.Cacheable.Visible", 1);
   // If the timed out had been used, the perceived TTFCP would have been
   // negative.
   histogram_tester().ExpectUniqueSample(
       "Prerender.websame_PrefetchTTFCP.Warm.Cacheable.Visible", 1361, 1);
@@ skipping 22 matching lines @@
 
   clock->Advance(base::TimeDelta::FromSeconds(1));
   NavigateToDestURLWithDisposition(WindowOpenDisposition::CURRENT_TAB, false);
 
   PrerenderPageLoadMetricsObserver observer(GetPrerenderManager(),
                                             GetActiveWebContents());
   observer.SetNavigationStartTicksForTesting(clock->NowTicks());
 
   page_load_metrics::PageLoadTiming timing;
   timing.navigation_start = base::Time::FromDoubleT(1);  // Non-null time.
-  timing.first_contentful_paint = base::TimeDelta::FromMilliseconds(2362);
+  timing.paint_timing.first_contentful_paint =
+      base::TimeDelta::FromMilliseconds(2362);
   page_load_metrics::PageLoadMetricsObserverTestHarness::
       PopulateRequiredTimingFields(&timing);
   observer.OnFirstContentfulPaint(timing, GenericPageLoadExtraInfo(dest_url()));
 
   histogram_tester().ExpectTotalCount(
       "Prerender.none_PrefetchTTFCP.Warm.Cacheable.Visible", 0);
   histogram_tester().ExpectTotalCount(
       "Prerender.none_PerceivedTTFCPRecorded.Visible", 1);
 
   // Check that the prerender didn't happen with a defined origin.
@@ skipping 28 matching lines @@
   clock->Advance(base::TimeDelta::FromSeconds(1));
   NavigateToDestURL();
 
   PrerenderPageLoadMetricsObserver observer(GetPrerenderManager(),
                                             GetActiveWebContents());
   observer.SetNavigationStartTicksForTesting(load_start);
 
   page_load_metrics::PageLoadTiming timing;
   timing.navigation_start = base::Time::FromDoubleT(1);  // Non-null time.
   // The FCP time should end up on the edge of the bucket.
-  timing.first_contentful_paint = base::TimeDelta::FromMilliseconds(2654);
+  timing.paint_timing.first_contentful_paint =
+      base::TimeDelta::FromMilliseconds(2654);
   page_load_metrics::PageLoadMetricsObserverTestHarness::
       PopulateRequiredTimingFields(&timing);
   observer.OnFirstContentfulPaint(timing, GenericPageLoadExtraInfo(dest_url()));
 
   histogram_tester().ExpectTotalCount(
       "Prerender.websame_PrefetchTTFCP.Warm.Cacheable.Visible", 1);
   histogram_tester().ExpectUniqueSample(
       "Prerender.websame_PrefetchTTFCP.Warm.Cacheable.Visible", 1654, 1);
 }
 
 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, FirstContentfulPaintHidden) {
   GetPrerenderManager()->DisablePageLoadMetricsObserverForTesting();
   base::SimpleTestTickClock* clock = OverridePrerenderManagerTimeTicks();
   base::TimeTicks load_start = clock->NowTicks();
   PrerenderTestURL("/prerender/prerender_page.html", FINAL_STATUS_USED, 1);
 
   clock->Advance(base::TimeDelta::FromSeconds(1));
   NavigateToDestURL();
 
   PrerenderPageLoadMetricsObserver observer(GetPrerenderManager(),
                                             GetActiveWebContents());
   observer.SetNavigationStartTicksForTesting(load_start);
 
   EXPECT_EQ(page_load_metrics::PageLoadMetricsObserver::CONTINUE_OBSERVING,
             observer.OnHidden(page_load_metrics::PageLoadTiming(),
                               GenericPageLoadExtraInfo(dest_url())));
 
   page_load_metrics::PageLoadTiming timing;
   timing.navigation_start = base::Time::FromDoubleT(1);  // Non-null time.
-  timing.first_contentful_paint = base::TimeDelta::FromMilliseconds(2654);
+  timing.paint_timing.first_contentful_paint =
+      base::TimeDelta::FromMilliseconds(2654);
   page_load_metrics::PageLoadMetricsObserverTestHarness::
       PopulateRequiredTimingFields(&timing);
   observer.OnFirstContentfulPaint(timing, GenericPageLoadExtraInfo(dest_url()));
 
   histogram_tester().ExpectTotalCount(
       "Prerender.websame_PrefetchTTFCP.Warm.Cacheable.Hidden", 1);
   histogram_tester().ExpectUniqueSample(
       "Prerender.websame_PrefetchTTFCP.Warm.Cacheable.Hidden", 1654, 1);
 }
 
@@ skipping 24 matching lines @@
   PrerenderPageLoadMetricsObserver observer(GetPrerenderManager(),
                                             GetActiveWebContents());
   observer.SetNavigationStartTicksForTesting(clock->NowTicks());
 
   EXPECT_EQ(page_load_metrics::PageLoadMetricsObserver::CONTINUE_OBSERVING,
             observer.OnHidden(page_load_metrics::PageLoadTiming(),
                               GenericPageLoadExtraInfo(dest_url())));
 
   page_load_metrics::PageLoadTiming timing;
   timing.navigation_start = base::Time::FromDoubleT(1);  // Non-null time.
-  timing.first_contentful_paint = base::TimeDelta::FromMilliseconds(2362);
+  timing.paint_timing.first_contentful_paint =
+      base::TimeDelta::FromMilliseconds(2362);
   page_load_metrics::PageLoadMetricsObserverTestHarness::
       PopulateRequiredTimingFields(&timing);
   observer.OnFirstContentfulPaint(timing, GenericPageLoadExtraInfo(dest_url()));
 
   histogram_tester().ExpectTotalCount(
       "Prerender.none_PrefetchTTFCP.Warm.Cacheable.Hidden", 0);
   histogram_tester().ExpectTotalCount(
       "Prerender.none_PerceivedTTFCPRecorded.Hidden", 1);
 
   // Check that the prerender didn't happen with a defined origin.
@@ skipping 219 matching lines @@
   ASSERT_TRUE(content::ExecuteScriptAndExtractBool(web_contents,
                                                    "DidDisplayReallyPass()",
                                                    &display_test_result));
   ASSERT_TRUE(display_test_result);
 }
 #endif  // !defined(DISABLE_NACL)
 
 }  // namespace prerender
 
 #endif  // !defined(OS_MACOSX) || !defined(ADDRESS_SANITIZER)