Buffer cross frame paint timing updates.

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 22 matching lines @@
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 
 #include "chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h"
 #include "chrome/browser/chrome_content_browser_client.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/external_protocol/external_protocol_handler.h"
 #include "chrome/browser/net/prediction_options.h"
-#include "chrome/browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.h"
 #include "chrome/browser/page_load_metrics/observers/prerender_page_load_metrics_observer.h"
 #include "chrome/browser/password_manager/password_store_factory.h"
 #include "chrome/browser/predictors/autocomplete_action_predictor.h"
 #include "chrome/browser/predictors/autocomplete_action_predictor_factory.h"
 #include "chrome/browser/prerender/prerender_contents.h"
 #include "chrome/browser/prerender/prerender_field_trial.h"
 #include "chrome/browser/prerender/prerender_handle.h"
 #include "chrome/browser/prerender/prerender_link_manager.h"
 #include "chrome/browser/prerender/prerender_link_manager_factory.h"
 #include "chrome/browser/prerender/prerender_manager.h"
@@ skipping 10 matching lines @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/location_bar/location_bar.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
 #include "chrome/common/chrome_features.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/page_load_metrics/test/page_load_metrics_test_util.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/favicon/content/content_favicon_driver.h"
 #include "components/favicon/core/favicon_driver_observer.h"
 #include "components/omnibox/browser/omnibox_edit_model.h"
 #include "components/omnibox/browser/omnibox_popup_model.h"
 #include "components/omnibox/browser/omnibox_view.h"
 #include "components/password_manager/core/browser/password_bubble_experiment.h"
 #include "components/password_manager/core/browser/password_manager_test_utils.h"
 #include "components/password_manager/core/browser/test_password_store.h"
@@ skipping 3348 matching lines @@
 
   PrerenderPageLoadMetricsObserver observer(GetPrerenderManager(),
                                             GetActiveWebContents());
   observer.SetNavigationStartTicksForTesting(load_start);
 
   page_load_metrics::mojom::PageLoadTiming timing;
   page_load_metrics::InitPageLoadTimingForTest(&timing);
   timing.navigation_start = base::Time::FromDoubleT(1);  // Non-null time.
   timing.paint_timing->first_contentful_paint =
       base::TimeDelta::FromMilliseconds(2654);
-  page_load_metrics::PageLoadMetricsObserverTestHarness::
-      PopulateRequiredTimingFields(&timing);
+  PopulateRequiredTimingFields(&timing);
   observer.OnFirstContentfulPaintInPage(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, FirstContentfulPaintTimingReuse) {
@@ skipping 21 matching lines @@
   NavigateToDestURL();
   PrerenderPageLoadMetricsObserver observer(GetPrerenderManager(),
                                             GetActiveWebContents());
   observer.SetNavigationStartTicksForTesting(load_start);
 
   page_load_metrics::mojom::PageLoadTiming timing;
   page_load_metrics::InitPageLoadTimingForTest(&timing);
   timing.navigation_start = base::Time::FromDoubleT(1);  // Non-null time.
   timing.paint_timing->first_contentful_paint =
       base::TimeDelta::FromMilliseconds(2361);
-  page_load_metrics::PageLoadMetricsObserverTestHarness::
-      PopulateRequiredTimingFields(&timing);
+  PopulateRequiredTimingFields(&timing);
   observer.OnFirstContentfulPaintInPage(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 21 matching lines @@
 
   PrerenderPageLoadMetricsObserver observer(GetPrerenderManager(),
                                             GetActiveWebContents());
   observer.SetNavigationStartTicksForTesting(load_start);
 
   page_load_metrics::mojom::PageLoadTiming timing;
   page_load_metrics::InitPageLoadTimingForTest(&timing);
   timing.navigation_start = base::Time::FromDoubleT(1);  // Non-null time.
   timing.paint_timing->first_contentful_paint =
       base::TimeDelta::FromMilliseconds(2361);
-  page_load_metrics::PageLoadMetricsObserverTestHarness::
-      PopulateRequiredTimingFields(&timing);
+  PopulateRequiredTimingFields(&timing);
   observer.OnFirstContentfulPaintInPage(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 23 matching lines @@
 
   PrerenderPageLoadMetricsObserver observer(GetPrerenderManager(),
                                             GetActiveWebContents());
   observer.SetNavigationStartTicksForTesting(clock->NowTicks());
 
   page_load_metrics::mojom::PageLoadTiming timing;
   page_load_metrics::InitPageLoadTimingForTest(&timing);
   timing.navigation_start = base::Time::FromDoubleT(1);  // Non-null time.
   timing.paint_timing->first_contentful_paint =
       base::TimeDelta::FromMilliseconds(2362);
-  page_load_metrics::PageLoadMetricsObserverTestHarness::
-      PopulateRequiredTimingFields(&timing);
+  PopulateRequiredTimingFields(&timing);
   observer.OnFirstContentfulPaintInPage(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.
   histogram_tester().ExpectTotalCount(
@@ skipping 30 matching lines @@
   PrerenderPageLoadMetricsObserver observer(GetPrerenderManager(),
                                             GetActiveWebContents());
   observer.SetNavigationStartTicksForTesting(load_start);
 
   page_load_metrics::mojom::PageLoadTiming timing;
   page_load_metrics::InitPageLoadTimingForTest(&timing);
   timing.navigation_start = base::Time::FromDoubleT(1);  // Non-null time.
   // The FCP time should end up on the edge of the bucket.
   timing.paint_timing->first_contentful_paint =
       base::TimeDelta::FromMilliseconds(2654);
-  page_load_metrics::PageLoadMetricsObserverTestHarness::
-      PopulateRequiredTimingFields(&timing);
+  PopulateRequiredTimingFields(&timing);
   observer.OnFirstContentfulPaintInPage(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) {
@@ skipping 11 matching lines @@
 
   EXPECT_EQ(page_load_metrics::PageLoadMetricsObserver::CONTINUE_OBSERVING,
             observer.OnHidden(page_load_metrics::mojom::PageLoadTiming(),
                               GenericPageLoadExtraInfo(dest_url())));
 
   page_load_metrics::mojom::PageLoadTiming timing;
   page_load_metrics::InitPageLoadTimingForTest(&timing);
   timing.navigation_start = base::Time::FromDoubleT(1);  // Non-null time.
   timing.paint_timing->first_contentful_paint =
       base::TimeDelta::FromMilliseconds(2654);
-  page_load_metrics::PageLoadMetricsObserverTestHarness::
-      PopulateRequiredTimingFields(&timing);
+  PopulateRequiredTimingFields(&timing);
   observer.OnFirstContentfulPaintInPage(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);
 }
 
 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
@@ skipping 25 matching lines @@
 
   EXPECT_EQ(page_load_metrics::PageLoadMetricsObserver::CONTINUE_OBSERVING,
             observer.OnHidden(page_load_metrics::mojom::PageLoadTiming(),
                               GenericPageLoadExtraInfo(dest_url())));
 
   page_load_metrics::mojom::PageLoadTiming timing;
   page_load_metrics::InitPageLoadTimingForTest(&timing);
   timing.navigation_start = base::Time::FromDoubleT(1);  // Non-null time.
   timing.paint_timing->first_contentful_paint =
       base::TimeDelta::FromMilliseconds(2362);
-  page_load_metrics::PageLoadMetricsObserverTestHarness::
-      PopulateRequiredTimingFields(&timing);
+  PopulateRequiredTimingFields(&timing);
   observer.OnFirstContentfulPaintInPage(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.
   histogram_tester().ExpectTotalCount(
@@ skipping 218 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)