summaryrefslogtreecommitdiff
path: root/chromium/components/ukm/content/source_url_recorder_browsertest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/components/ukm/content/source_url_recorder_browsertest.cc')
-rw-r--r--chromium/components/ukm/content/source_url_recorder_browsertest.cc9
1 files changed, 4 insertions, 5 deletions
diff --git a/chromium/components/ukm/content/source_url_recorder_browsertest.cc b/chromium/components/ukm/content/source_url_recorder_browsertest.cc
index ff755a6783f..72969135457 100644
--- a/chromium/components/ukm/content/source_url_recorder_browsertest.cc
+++ b/chromium/components/ukm/content/source_url_recorder_browsertest.cc
@@ -94,7 +94,7 @@ IN_PROC_BROWSER_TEST_F(SourceUrlRecorderWebContentsObserverBrowserTest,
GURL url = embedded_test_server()->GetURL("/title1.html");
content::NavigationHandleObserver observer(shell()->web_contents(), url);
- content::NavigateToURL(shell(), url);
+ EXPECT_TRUE(content::NavigateToURL(shell(), url));
EXPECT_TRUE(observer.has_committed());
const ukm::UkmSource* source =
GetSourceForNavigationId(observer.navigation_id());
@@ -130,7 +130,7 @@ IN_PROC_BROWSER_TEST_F(SourceUrlRecorderWebContentsObserverBrowserTest,
main_url);
content::NavigationHandleObserver subframe_observer(shell()->web_contents(),
subframe_url);
- content::NavigateToURL(shell(), main_url);
+ EXPECT_TRUE(content::NavigateToURL(shell(), main_url));
EXPECT_TRUE(main_observer.has_committed());
EXPECT_TRUE(main_observer.is_main_frame());
EXPECT_TRUE(subframe_observer.has_committed());
@@ -161,12 +161,11 @@ IN_PROC_BROWSER_TEST_F(SourceUrlRecorderWebContentsObserverBrowserTest,
EXPECT_NE(source->id(), ukm_entries[1]->source_id);
}
-// Flaky on all OSes: https://crbug.com/951020
IN_PROC_BROWSER_TEST_F(SourceUrlRecorderWebContentsObserverDownloadBrowserTest,
- DISABLED_IgnoreDownload) {
+ IgnoreDownload) {
GURL url(embedded_test_server()->GetURL("/download-test1.lib"));
content::NavigationHandleObserver observer(shell()->web_contents(), url);
- content::NavigateToURL(shell(), url);
+ EXPECT_TRUE(content::NavigateToURLAndExpectNoCommit(shell(), url));
EXPECT_FALSE(observer.has_committed());
EXPECT_TRUE(observer.is_download());
EXPECT_EQ(nullptr, GetSourceForNavigationId(observer.navigation_id()));