Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/page_load_metrics/page_load_metrics_browsertest.cc

Issue 2176803002: Fix flaky MetricsWebContentsObserverBrowserTests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: switch to about:blank Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 d9ab6205802752b5512db1c32ec82852f443d652..ddd6cb8957531a8b6c00a4f6c600fb4849e6b2ff 100644
--- a/chrome/browser/page_load_metrics/page_load_metrics_browsertest.cc
+++ b/chrome/browser/page_load_metrics/page_load_metrics_browsertest.cc
@@ -17,6 +17,10 @@ class MetricsWebContentsObserverBrowserTest : public InProcessBrowserTest {
~MetricsWebContentsObserverBrowserTest() override {}
protected:
+ void NavigateToUntrackedUrl() {
+ ui_test_utils::NavigateToURL(browser(), GURL(url::kAboutBlankURL));
+ }
+
base::HistogramTester histogram_tester_;
DISALLOW_COPY_AND_ASSIGN(MetricsWebContentsObserverBrowserTest);
@@ -36,8 +40,7 @@ IN_PROC_BROWSER_TEST_F(MetricsWebContentsObserverBrowserTest, NewPage) {
ui_test_utils::NavigateToURL(browser(),
embedded_test_server()->GetURL("/title1.html"));
- ui_test_utils::NavigateToURL(browser(),
- embedded_test_server()->GetURL("/title2.html"));
+ NavigateToUntrackedUrl();
histogram_tester_.ExpectTotalCount(internal::kHistogramDomContentLoaded, 1);
histogram_tester_.ExpectTotalCount(internal::kHistogramLoad, 1);
@@ -47,34 +50,30 @@ IN_PROC_BROWSER_TEST_F(MetricsWebContentsObserverBrowserTest, NewPage) {
internal::kHistogramParseBlockedOnScriptLoad, 1);
}
-// Flaky in win: crbug.com/630076
IN_PROC_BROWSER_TEST_F(MetricsWebContentsObserverBrowserTest,
- DISABLED_SamePageNavigation) {
+ SamePageNavigation) {
ASSERT_TRUE(embedded_test_server()->Start());
ui_test_utils::NavigateToURL(browser(),
embedded_test_server()->GetURL("/title1.html"));
ui_test_utils::NavigateToURL(
browser(), embedded_test_server()->GetURL("/title1.html#hash"));
- ui_test_utils::NavigateToURL(browser(),
- embedded_test_server()->GetURL("/title2.html"));
+ NavigateToUntrackedUrl();
histogram_tester_.ExpectTotalCount(internal::kHistogramDomContentLoaded, 1);
histogram_tester_.ExpectTotalCount(internal::kHistogramLoad, 1);
histogram_tester_.ExpectTotalCount(internal::kHistogramFirstLayout, 1);
}
-// Flaky in win: crbug.com/630076
IN_PROC_BROWSER_TEST_F(MetricsWebContentsObserverBrowserTest,
- DISABLED_SameUrlNavigation) {
+ SameUrlNavigation) {
ASSERT_TRUE(embedded_test_server()->Start());
ui_test_utils::NavigateToURL(browser(),
embedded_test_server()->GetURL("/title1.html"));
ui_test_utils::NavigateToURL(browser(),
embedded_test_server()->GetURL("/title1.html"));
- ui_test_utils::NavigateToURL(browser(),
- embedded_test_server()->GetURL("/title2.html"));
+ NavigateToUntrackedUrl();
// We expect one histogram sample for each navigation to title1.html.
histogram_tester_.ExpectTotalCount(internal::kHistogramCommit, 2);
@@ -89,8 +88,7 @@ IN_PROC_BROWSER_TEST_F(MetricsWebContentsObserverBrowserTest,
ui_test_utils::NavigateToURL(browser(),
embedded_test_server()->GetURL("/simple.svg"));
- ui_test_utils::NavigateToURL(browser(),
- embedded_test_server()->GetURL("/title1.html"));
+ NavigateToUntrackedUrl();
histogram_tester_.ExpectTotalCount(internal::kHistogramCommit, 0);
}
@@ -100,8 +98,7 @@ IN_PROC_BROWSER_TEST_F(MetricsWebContentsObserverBrowserTest,
ASSERT_TRUE(embedded_test_server()->Start());
ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIVersionURL));
- ui_test_utils::NavigateToURL(browser(),
- embedded_test_server()->GetURL("/title1.html"));
+ NavigateToUntrackedUrl();
histogram_tester_.ExpectTotalCount(internal::kHistogramCommit, 0);
}
@@ -113,8 +110,7 @@ IN_PROC_BROWSER_TEST_F(MetricsWebContentsObserverBrowserTest,
ui_test_utils::NavigateToURL(
browser(), embedded_test_server()->GetURL(
"/page_load_metrics/document_write_external_script.html"));
- ui_test_utils::NavigateToURL(browser(),
- embedded_test_server()->GetURL("/title2.html"));
+ NavigateToUntrackedUrl();
histogram_tester_.ExpectTotalCount(
internal::kHistogramDocWriteParseStartToFirstContentfulPaint, 1);
@@ -127,8 +123,7 @@ IN_PROC_BROWSER_TEST_F(MetricsWebContentsObserverBrowserTest,
ui_test_utils::NavigateToURL(
browser(), embedded_test_server()->GetURL(
"/page_load_metrics/document_write_no_script.html"));
- ui_test_utils::NavigateToURL(browser(),
- embedded_test_server()->GetURL("/title2.html"));
+ NavigateToUntrackedUrl();
histogram_tester_.ExpectTotalCount(
internal::kHistogramDocWriteParseStartToFirstContentfulPaint, 0);
@@ -139,8 +134,7 @@ IN_PROC_BROWSER_TEST_F(MetricsWebContentsObserverBrowserTest, NoDocumentWrite) {
ui_test_utils::NavigateToURL(browser(),
embedded_test_server()->GetURL("/title1.html"));
- ui_test_utils::NavigateToURL(browser(),
- embedded_test_server()->GetURL("/title2.html"));
+ NavigateToUntrackedUrl();
histogram_tester_.ExpectTotalCount(
internal::kHistogramDocWriteParseStartToFirstContentfulPaint, 0);
histogram_tester_.ExpectTotalCount(
@@ -154,9 +148,7 @@ IN_PROC_BROWSER_TEST_F(MetricsWebContentsObserverBrowserTest,
ui_test_utils::NavigateToURL(
browser(), embedded_test_server()->GetURL(
"/page_load_metrics/document_write_script_block.html"));
-
- ui_test_utils::NavigateToURL(browser(),
- embedded_test_server()->GetURL("/title2.html"));
+ NavigateToUntrackedUrl();
histogram_tester_.ExpectTotalCount(
internal::kHistogramDocWriteBlockParseStartToFirstContentfulPaint, 1);
@@ -182,8 +174,7 @@ IN_PROC_BROWSER_TEST_F(MetricsWebContentsObserverBrowserTest,
histogram_tester_.ExpectTotalCount(
internal::kHistogramDocWriteBlockParseStartToFirstContentfulPaint, 1);
- ui_test_utils::NavigateToURL(browser(),
- embedded_test_server()->GetURL("/title2.html"));
+ NavigateToUntrackedUrl();
histogram_tester_.ExpectTotalCount(
internal::kHistogramDocWriteBlockParseStartToFirstContentfulPaint, 1);
@@ -199,8 +190,7 @@ IN_PROC_BROWSER_TEST_F(MetricsWebContentsObserverBrowserTest,
ui_test_utils::NavigateToURL(
browser(), embedded_test_server()->GetURL(
"/page_load_metrics/document_write_script_async.html"));
- ui_test_utils::NavigateToURL(browser(),
- embedded_test_server()->GetURL("/title2.html"));
+ NavigateToUntrackedUrl();
histogram_tester_.ExpectTotalCount(
internal::kHistogramDocWriteBlockParseStartToFirstContentfulPaint, 0);
@@ -213,8 +203,7 @@ IN_PROC_BROWSER_TEST_F(MetricsWebContentsObserverBrowserTest,
ui_test_utils::NavigateToURL(
browser(), embedded_test_server()->GetURL(
"/page_load_metrics/document_write_external_script.html"));
- ui_test_utils::NavigateToURL(browser(),
- embedded_test_server()->GetURL("/title2.html"));
+ NavigateToUntrackedUrl();
histogram_tester_.ExpectTotalCount(
internal::kHistogramDocWriteBlockParseStartToFirstContentfulPaint, 0);
@@ -227,8 +216,7 @@ IN_PROC_BROWSER_TEST_F(MetricsWebContentsObserverBrowserTest,
ui_test_utils::NavigateToURL(
browser(), embedded_test_server()->GetURL(
"/page_load_metrics/document_write_no_script.html"));
- ui_test_utils::NavigateToURL(browser(),
- embedded_test_server()->GetURL("/title2.html"));
+ NavigateToUntrackedUrl();
histogram_tester_.ExpectTotalCount(
internal::kHistogramDocWriteBlockParseStartToFirstContentfulPaint, 0);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698