| Index: chrome/browser/page_load_metrics/page_load_metrics_browsertest.cc
|
| diff --git a/chrome/browser/page_load_metrics/page_load_metrics_browsertest.cc b/chrome/browser/page_load_metrics/page_load_metrics_browsertest.cc
|
| index bf18d3bdbefce717fbc9704108cca9cfbb298720..57e3b3ea0f6354e84656c09afbaf53552233374f 100644
|
| --- a/chrome/browser/page_load_metrics/page_load_metrics_browsertest.cc
|
| +++ b/chrome/browser/page_load_metrics/page_load_metrics_browsertest.cc
|
| @@ -7,6 +7,7 @@
|
| #include "base/files/scoped_temp_dir.h"
|
| #include "base/macros.h"
|
| #include "base/test/histogram_tester.h"
|
| +#include "base/test/scoped_feature_list.h"
|
| #include "base/threading/thread_restrictions.h"
|
| #include "base/time/time.h"
|
| #include "chrome/browser/page_load_metrics/metrics_web_contents_observer.h"
|
| @@ -21,7 +22,7 @@
|
| #include "chrome/browser/ui/browser.h"
|
| #include "chrome/browser/ui/browser_navigator_params.h"
|
| #include "chrome/browser/ui/tabs/tab_strip_model.h"
|
| -#include "chrome/common/page_load_metrics/page_load_metrics_messages.h"
|
| +#include "chrome/common/chrome_features.h"
|
| #include "chrome/common/pref_names.h"
|
| #include "chrome/common/url_constants.h"
|
| #include "chrome/test/base/in_process_browser_test.h"
|
| @@ -44,6 +45,8 @@
|
| #include "net/url_request/url_request_context_getter.h"
|
|
|
| namespace {
|
| +using IPCType =
|
| + page_load_metrics::MetricsWebContentsObserver::TestingObserver::IPCType;
|
|
|
| void FailAllNetworkTransactions(net::URLRequestContextGetter* getter) {
|
| DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
|
| @@ -192,14 +195,81 @@ class PageLoadMetricsWaiter
|
|
|
| using TimingField = PageLoadMetricsWaiter::TimingField;
|
|
|
| +class IPCTypeVerifier
|
| + : public page_load_metrics::MetricsWebContentsObserver::TestingObserver {
|
| + public:
|
| + explicit IPCTypeVerifier(content::WebContents* web_contents)
|
| + : TestingObserver(web_contents) {}
|
| +
|
| + ~IPCTypeVerifier() override { AssertValidUpdateState(); }
|
| +
|
| + void ExpectNoTimingUpdates() { expect_updates_ = false; }
|
| +
|
| + void DidReceiveTimingUpdate(IPCType type) override {
|
| + ++num_updates_;
|
| + const bool is_mojo_enabled =
|
| + base::FeatureList::IsEnabled(features::kPageLoadMetricsMojofication);
|
| + switch (type) {
|
| + case IPCType::LEGACY:
|
| + ASSERT_FALSE(is_mojo_enabled);
|
| + break;
|
| + case IPCType::MOJO:
|
| + ASSERT_TRUE(is_mojo_enabled);
|
| + break;
|
| + default:
|
| + FAIL() << "Unknown IPCType";
|
| + break;
|
| + }
|
| + }
|
| +
|
| + private:
|
| + void AssertValidUpdateState() {
|
| + ASSERT_EQ(expect_updates_, num_updates_ > 0);
|
| + }
|
| +
|
| + bool expect_updates_ = true;
|
| + int num_updates_ = 0;
|
| +};
|
| +
|
| } // namespace
|
|
|
| -class PageLoadMetricsBrowserTest : public InProcessBrowserTest {
|
| +class PageLoadMetricsBrowserTest : public InProcessBrowserTest,
|
| + public testing::WithParamInterface<IPCType> {
|
| public:
|
| PageLoadMetricsBrowserTest() {}
|
| ~PageLoadMetricsBrowserTest() override {}
|
|
|
| protected:
|
| + void SetUpCommandLine(base::CommandLine* command_line) override {
|
| + InProcessBrowserTest::SetUpCommandLine(command_line);
|
| +
|
| + // We need to set the feature state before the render process is created,
|
| + // in order for it to inherit the feature state from the browser process.
|
| + // SetUp() runs too early, and SetUpOnMainThread() runs too late.
|
| + const IPCType ipc_type = GetParam();
|
| + switch (ipc_type) {
|
| + case IPCType::LEGACY:
|
| + scoped_feature_list_.InitAndDisableFeature(
|
| + features::kPageLoadMetricsMojofication);
|
| + break;
|
| + case IPCType::MOJO:
|
| + scoped_feature_list_.InitAndEnableFeature(
|
| + features::kPageLoadMetricsMojofication);
|
| + break;
|
| + default:
|
| + CHECK(false) << "Unknown IPCType.";
|
| + break;
|
| + }
|
| + }
|
| +
|
| + void SetUpOnMainThread() override {
|
| + InProcessBrowserTest::SetUpOnMainThread();
|
| +
|
| + content::WebContents* web_contents =
|
| + browser()->tab_strip_model()->GetActiveWebContents();
|
| + ipc_type_verifier_ = base::MakeUnique<IPCTypeVerifier>(web_contents);
|
| + }
|
| +
|
| // Force navigation to a new page, so the currently tracked page load runs its
|
| // OnComplete callback. You should prefer to use PageLoadMetricsWaiter, and
|
| // only use NavigateToUntrackedUrl for cases where the waiter isn't
|
| @@ -225,18 +295,23 @@ class PageLoadMetricsBrowserTest : public InProcessBrowserTest {
|
| return base::MakeUnique<PageLoadMetricsWaiter>(web_contents);
|
| }
|
|
|
| + void ExpectNoTimingUpdates() { ipc_type_verifier_->ExpectNoTimingUpdates(); }
|
| +
|
| + base::test::ScopedFeatureList scoped_feature_list_;
|
| base::HistogramTester histogram_tester_;
|
| + std::unique_ptr<IPCTypeVerifier> ipc_type_verifier_;
|
|
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(PageLoadMetricsBrowserTest);
|
| };
|
|
|
| -IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, NoNavigation) {
|
| +IN_PROC_BROWSER_TEST_P(PageLoadMetricsBrowserTest, NoNavigation) {
|
| + ExpectNoTimingUpdates();
|
| ASSERT_TRUE(embedded_test_server()->Start());
|
| EXPECT_TRUE(NoPageLoadMetricsRecorded());
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, NewPage) {
|
| +IN_PROC_BROWSER_TEST_P(PageLoadMetricsBrowserTest, NewPage) {
|
| ASSERT_TRUE(embedded_test_server()->Start());
|
|
|
| auto waiter = CreatePageLoadMetricsWaiter();
|
| @@ -267,7 +342,7 @@ IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, NewPage) {
|
| EXPECT_FALSE(NoPageLoadMetricsRecorded());
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, NoPaintForEmptyDocument) {
|
| +IN_PROC_BROWSER_TEST_P(PageLoadMetricsBrowserTest, NoPaintForEmptyDocument) {
|
| ASSERT_TRUE(embedded_test_server()->Start());
|
|
|
| auto waiter = CreatePageLoadMetricsWaiter();
|
| @@ -285,7 +360,7 @@ IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, NoPaintForEmptyDocument) {
|
| 0);
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest,
|
| +IN_PROC_BROWSER_TEST_P(PageLoadMetricsBrowserTest,
|
| NoPaintForEmptyDocumentInChildFrame) {
|
| ASSERT_TRUE(embedded_test_server()->Start());
|
|
|
| @@ -308,7 +383,7 @@ IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest,
|
| 0);
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, PaintInChildFrame) {
|
| +IN_PROC_BROWSER_TEST_P(PageLoadMetricsBrowserTest, PaintInChildFrame) {
|
| ASSERT_TRUE(embedded_test_server()->Start());
|
|
|
| GURL a_url(embedded_test_server()->GetURL("/page_load_metrics/iframe.html"));
|
| @@ -325,7 +400,7 @@ IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, PaintInChildFrame) {
|
| histogram_tester_.ExpectTotalCount(internal::kHistogramFirstPaint, 1);
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, PaintInMultipleChildFrames) {
|
| +IN_PROC_BROWSER_TEST_P(PageLoadMetricsBrowserTest, PaintInMultipleChildFrames) {
|
| ASSERT_TRUE(embedded_test_server()->Start());
|
|
|
| GURL a_url(embedded_test_server()->GetURL("/page_load_metrics/iframes.html"));
|
| @@ -343,7 +418,7 @@ IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, PaintInMultipleChildFrames) {
|
| histogram_tester_.ExpectTotalCount(internal::kHistogramFirstPaint, 1);
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, PaintInMainAndChildFrame) {
|
| +IN_PROC_BROWSER_TEST_P(PageLoadMetricsBrowserTest, PaintInMainAndChildFrame) {
|
| ASSERT_TRUE(embedded_test_server()->Start());
|
|
|
| GURL a_url(embedded_test_server()->GetURL(
|
| @@ -364,7 +439,7 @@ IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, PaintInMainAndChildFrame) {
|
| histogram_tester_.ExpectTotalCount(internal::kHistogramFirstPaint, 1);
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, SameDocumentNavigation) {
|
| +IN_PROC_BROWSER_TEST_P(PageLoadMetricsBrowserTest, SameDocumentNavigation) {
|
| ASSERT_TRUE(embedded_test_server()->Start());
|
|
|
| auto waiter = CreatePageLoadMetricsWaiter();
|
| @@ -388,7 +463,7 @@ IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, SameDocumentNavigation) {
|
| histogram_tester_.ExpectTotalCount(internal::kHistogramFirstLayout, 1);
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, SameUrlNavigation) {
|
| +IN_PROC_BROWSER_TEST_P(PageLoadMetricsBrowserTest, SameUrlNavigation) {
|
| ASSERT_TRUE(embedded_test_server()->Start());
|
|
|
| auto waiter = CreatePageLoadMetricsWaiter();
|
| @@ -415,33 +490,36 @@ IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, SameUrlNavigation) {
|
| histogram_tester_.ExpectTotalCount(internal::kHistogramFirstLayout, 2);
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, NonHtmlMainResource) {
|
| +IN_PROC_BROWSER_TEST_P(PageLoadMetricsBrowserTest, NonHtmlMainResource) {
|
| ASSERT_TRUE(embedded_test_server()->Start());
|
|
|
| ui_test_utils::NavigateToURL(browser(),
|
| embedded_test_server()->GetURL("/circle.svg"));
|
| NavigateToUntrackedUrl();
|
| + ExpectNoTimingUpdates();
|
| EXPECT_TRUE(NoPageLoadMetricsRecorded());
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, NonHttpOrHttpsUrl) {
|
| +IN_PROC_BROWSER_TEST_P(PageLoadMetricsBrowserTest, NonHttpOrHttpsUrl) {
|
| ASSERT_TRUE(embedded_test_server()->Start());
|
|
|
| ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIVersionURL));
|
| NavigateToUntrackedUrl();
|
| + ExpectNoTimingUpdates();
|
| EXPECT_TRUE(NoPageLoadMetricsRecorded());
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, HttpErrorPage) {
|
| +IN_PROC_BROWSER_TEST_P(PageLoadMetricsBrowserTest, HttpErrorPage) {
|
| ASSERT_TRUE(embedded_test_server()->Start());
|
|
|
| ui_test_utils::NavigateToURL(
|
| browser(), embedded_test_server()->GetURL("/page_load_metrics/404.html"));
|
| NavigateToUntrackedUrl();
|
| + ExpectNoTimingUpdates();
|
| EXPECT_TRUE(NoPageLoadMetricsRecorded());
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, ChromeErrorPage) {
|
| +IN_PROC_BROWSER_TEST_P(PageLoadMetricsBrowserTest, ChromeErrorPage) {
|
| ASSERT_TRUE(embedded_test_server()->Start());
|
|
|
| // Configure the network stack to fail all attempted loads with a network
|
| @@ -456,19 +534,21 @@ IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, ChromeErrorPage) {
|
| ui_test_utils::NavigateToURL(browser(),
|
| embedded_test_server()->GetURL("/title1.html"));
|
| NavigateToUntrackedUrl();
|
| + ExpectNoTimingUpdates();
|
| EXPECT_TRUE(NoPageLoadMetricsRecorded());
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, Ignore204Pages) {
|
| +IN_PROC_BROWSER_TEST_P(PageLoadMetricsBrowserTest, Ignore204Pages) {
|
| ASSERT_TRUE(embedded_test_server()->Start());
|
|
|
| ui_test_utils::NavigateToURL(browser(),
|
| embedded_test_server()->GetURL("/page204.html"));
|
| NavigateToUntrackedUrl();
|
| + ExpectNoTimingUpdates();
|
| EXPECT_TRUE(NoPageLoadMetricsRecorded());
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, IgnoreDownloads) {
|
| +IN_PROC_BROWSER_TEST_P(PageLoadMetricsBrowserTest, IgnoreDownloads) {
|
| ASSERT_TRUE(embedded_test_server()->Start());
|
|
|
| base::ThreadRestrictions::ScopedAllowIO allow_io;
|
| @@ -486,10 +566,11 @@ IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, IgnoreDownloads) {
|
| downloads_observer.WaitForFinished();
|
|
|
| NavigateToUntrackedUrl();
|
| + ExpectNoTimingUpdates();
|
| EXPECT_TRUE(NoPageLoadMetricsRecorded());
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, PreloadDocumentWrite) {
|
| +IN_PROC_BROWSER_TEST_P(PageLoadMetricsBrowserTest, PreloadDocumentWrite) {
|
| ASSERT_TRUE(embedded_test_server()->Start());
|
|
|
| auto waiter = CreatePageLoadMetricsWaiter();
|
| @@ -504,7 +585,7 @@ IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, PreloadDocumentWrite) {
|
| internal::kHistogramDocWriteParseStartToFirstContentfulPaint, 1);
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, NoPreloadDocumentWrite) {
|
| +IN_PROC_BROWSER_TEST_P(PageLoadMetricsBrowserTest, NoPreloadDocumentWrite) {
|
| ASSERT_TRUE(embedded_test_server()->Start());
|
|
|
| auto waiter = CreatePageLoadMetricsWaiter();
|
| @@ -520,7 +601,7 @@ IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, NoPreloadDocumentWrite) {
|
| internal::kHistogramDocWriteParseStartToFirstContentfulPaint, 0);
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, NoDocumentWrite) {
|
| +IN_PROC_BROWSER_TEST_P(PageLoadMetricsBrowserTest, NoDocumentWrite) {
|
| ASSERT_TRUE(embedded_test_server()->Start());
|
|
|
| auto waiter = CreatePageLoadMetricsWaiter();
|
| @@ -539,7 +620,7 @@ IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, NoDocumentWrite) {
|
| histogram_tester_.ExpectTotalCount(internal::kHistogramDocWriteBlockCount, 0);
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, DocumentWriteBlock) {
|
| +IN_PROC_BROWSER_TEST_P(PageLoadMetricsBrowserTest, DocumentWriteBlock) {
|
| ASSERT_TRUE(embedded_test_server()->Start());
|
|
|
| auto waiter = CreatePageLoadMetricsWaiter();
|
| @@ -555,7 +636,7 @@ IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, DocumentWriteBlock) {
|
| histogram_tester_.ExpectTotalCount(internal::kHistogramDocWriteBlockCount, 1);
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, DocumentWriteReload) {
|
| +IN_PROC_BROWSER_TEST_P(PageLoadMetricsBrowserTest, DocumentWriteReload) {
|
| ASSERT_TRUE(embedded_test_server()->Start());
|
|
|
| auto waiter = CreatePageLoadMetricsWaiter();
|
| @@ -599,7 +680,7 @@ IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, DocumentWriteReload) {
|
| histogram_tester_.ExpectTotalCount(internal::kHistogramDocWriteBlockCount, 1);
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, DocumentWriteAsync) {
|
| +IN_PROC_BROWSER_TEST_P(PageLoadMetricsBrowserTest, DocumentWriteAsync) {
|
| ASSERT_TRUE(embedded_test_server()->Start());
|
|
|
| auto waiter = CreatePageLoadMetricsWaiter();
|
| @@ -616,7 +697,7 @@ IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, DocumentWriteAsync) {
|
| histogram_tester_.ExpectTotalCount(internal::kHistogramDocWriteBlockCount, 0);
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, DocumentWriteSameDomain) {
|
| +IN_PROC_BROWSER_TEST_P(PageLoadMetricsBrowserTest, DocumentWriteSameDomain) {
|
| ASSERT_TRUE(embedded_test_server()->Start());
|
|
|
| auto waiter = CreatePageLoadMetricsWaiter();
|
| @@ -633,7 +714,7 @@ IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, DocumentWriteSameDomain) {
|
| histogram_tester_.ExpectTotalCount(internal::kHistogramDocWriteBlockCount, 0);
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, NoDocumentWriteScript) {
|
| +IN_PROC_BROWSER_TEST_P(PageLoadMetricsBrowserTest, NoDocumentWriteScript) {
|
| ASSERT_TRUE(embedded_test_server()->Start());
|
|
|
| auto waiter = CreatePageLoadMetricsWaiter();
|
| @@ -656,7 +737,7 @@ IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, NoDocumentWriteScript) {
|
| #else
|
| #define MAYBE_BadXhtml BadXhtml
|
| #endif
|
| -IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, MAYBE_BadXhtml) {
|
| +IN_PROC_BROWSER_TEST_P(PageLoadMetricsBrowserTest, MAYBE_BadXhtml) {
|
| ASSERT_TRUE(embedded_test_server()->Start());
|
|
|
| auto waiter = CreatePageLoadMetricsWaiter();
|
| @@ -691,7 +772,7 @@ IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, MAYBE_BadXhtml) {
|
| // Test code that aborts provisional navigations.
|
| // TODO(csharrison): Move these to unit tests once the navigation API in content
|
| // properly calls NavigationHandle/NavigationThrottle methods.
|
| -IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, AbortNewNavigation) {
|
| +IN_PROC_BROWSER_TEST_P(PageLoadMetricsBrowserTest, AbortNewNavigation) {
|
| ASSERT_TRUE(embedded_test_server()->Start());
|
|
|
| GURL url(embedded_test_server()->GetURL("/title1.html"));
|
| @@ -715,7 +796,7 @@ IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, AbortNewNavigation) {
|
| internal::kHistogramAbortNewNavigationBeforeCommit, 1);
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, AbortReload) {
|
| +IN_PROC_BROWSER_TEST_P(PageLoadMetricsBrowserTest, AbortReload) {
|
| ASSERT_TRUE(embedded_test_server()->Start());
|
|
|
| GURL url(embedded_test_server()->GetURL("/title1.html"));
|
| @@ -743,7 +824,7 @@ IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, AbortReload) {
|
| #else
|
| #define MAYBE_AbortClose AbortClose
|
| #endif
|
| -IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, MAYBE_AbortClose) {
|
| +IN_PROC_BROWSER_TEST_P(PageLoadMetricsBrowserTest, MAYBE_AbortClose) {
|
| ASSERT_TRUE(embedded_test_server()->Start());
|
|
|
| GURL url(embedded_test_server()->GetURL("/title1.html"));
|
| @@ -760,9 +841,10 @@ IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, MAYBE_AbortClose) {
|
|
|
| histogram_tester_.ExpectTotalCount(internal::kHistogramAbortCloseBeforeCommit,
|
| 1);
|
| + ExpectNoTimingUpdates();
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, AbortMultiple) {
|
| +IN_PROC_BROWSER_TEST_P(PageLoadMetricsBrowserTest, AbortMultiple) {
|
| ASSERT_TRUE(embedded_test_server()->Start());
|
|
|
| GURL url(embedded_test_server()->GetURL("/title1.html"));
|
| @@ -796,7 +878,7 @@ IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, AbortMultiple) {
|
| internal::kHistogramAbortNewNavigationBeforeCommit, 2);
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest,
|
| +IN_PROC_BROWSER_TEST_P(PageLoadMetricsBrowserTest,
|
| NoAbortMetricsOnClientRedirect) {
|
| ASSERT_TRUE(embedded_test_server()->Start());
|
|
|
| @@ -829,7 +911,7 @@ IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest,
|
| .empty());
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest,
|
| +IN_PROC_BROWSER_TEST_P(PageLoadMetricsBrowserTest,
|
| FirstMeaningfulPaintRecorded) {
|
| ASSERT_TRUE(embedded_test_server()->Start());
|
|
|
| @@ -848,7 +930,7 @@ IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest,
|
| internal::kHistogramParseStartToFirstMeaningfulPaint, 1);
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest,
|
| +IN_PROC_BROWSER_TEST_P(PageLoadMetricsBrowserTest,
|
| FirstMeaningfulPaintNotRecorded) {
|
| ASSERT_TRUE(embedded_test_server()->Start());
|
|
|
| @@ -874,7 +956,7 @@ IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest,
|
| internal::kHistogramParseStartToFirstMeaningfulPaint, 0);
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest,
|
| +IN_PROC_BROWSER_TEST_P(PageLoadMetricsBrowserTest,
|
| NoStatePrefetchObserverCacheable) {
|
| ASSERT_TRUE(embedded_test_server()->Start());
|
|
|
| @@ -892,7 +974,7 @@ IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest,
|
| "Prerender.none_PrefetchTTFCP.Reference.Cacheable.Visible", 1);
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest,
|
| +IN_PROC_BROWSER_TEST_P(PageLoadMetricsBrowserTest,
|
| NoStatePrefetchObserverNoStore) {
|
| ASSERT_TRUE(embedded_test_server()->Start());
|
|
|
| @@ -910,7 +992,7 @@ IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest,
|
| "Prerender.none_PrefetchTTFCP.Reference.Cacheable.Visible", 0);
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, CSSTiming) {
|
| +IN_PROC_BROWSER_TEST_P(PageLoadMetricsBrowserTest, CSSTiming) {
|
| ASSERT_TRUE(embedded_test_server()->Start());
|
|
|
| auto waiter = CreatePageLoadMetricsWaiter();
|
| @@ -934,7 +1016,7 @@ IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, CSSTiming) {
|
| "PageLoad.CSSTiming.ParseAndUpdate.BeforeFirstContentfulPaint", 1);
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, PayloadSize) {
|
| +IN_PROC_BROWSER_TEST_P(PageLoadMetricsBrowserTest, PayloadSize) {
|
| ASSERT_TRUE(embedded_test_server()->Start());
|
|
|
| auto waiter = CreatePageLoadMetricsWaiter();
|
| @@ -953,3 +1035,8 @@ IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, PayloadSize) {
|
| // of the main HTML response).
|
| histogram_tester_.ExpectBucketCount(internal::kHistogramTotalBytes, 10, 1);
|
| }
|
| +
|
| +INSTANTIATE_TEST_CASE_P(
|
| + /* no prefix */,
|
| + PageLoadMetricsBrowserTest,
|
| + testing::Values(IPCType::LEGACY, IPCType::MOJO));
|
|
|