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

Unified Diff: chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc

Issue 584433002: Add UI for the new harmful download warning (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 6 years, 3 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
Index: chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
index 17f2506e7bd5db538b9af38c71e9c39a9061babb..21df9f3751e99900e44bdb9b7ab7206eeeeb56d2 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
@@ -670,6 +670,31 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageBrowserTest,
browser()->tab_strip_model()->GetActiveWebContents()->GetURL());
}
+IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageBrowserTest,
+ HarmfulDontProceed) {
+#if defined(OS_WIN) && defined(USE_ASH)
+ // Disable this test in Metro+Ash for now (http://crbug.com/262796).
+ if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+ return;
+#endif
+
+ SetupWarningAndNavigate(SB_THREAT_TYPE_URL_HARMFUL);
+
+ EXPECT_EQ(VISIBLE, GetVisibility("primary-button"));
+ EXPECT_EQ(HIDDEN, GetVisibility("details"));
+ EXPECT_EQ(HIDDEN, GetVisibility("proceed-link"));
+ EXPECT_EQ(HIDDEN, GetVisibility("error-code"));
+ EXPECT_TRUE(Click("details-button"));
+ EXPECT_EQ(VISIBLE, GetVisibility("details"));
+ EXPECT_EQ(VISIBLE, GetVisibility("proceed-link"));
+ EXPECT_EQ(HIDDEN, GetVisibility("error-code"));
+ EXPECT_TRUE(ClickAndWaitForDetach("primary-button"));
+
+ AssertNoInterstitial(false); // Assert the interstitial is gone
+ EXPECT_EQ(GURL(url::kAboutBlankURL), // Back to "about:blank"
+ browser()->tab_strip_model()->GetActiveWebContents()->GetURL());
+}
+
IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageBrowserTest, MalwareProceed) {
GURL url = SetupWarningAndNavigate(SB_THREAT_TYPE_URL_MALWARE);
@@ -679,6 +704,15 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageBrowserTest, MalwareProceed) {
browser()->tab_strip_model()->GetActiveWebContents()->GetURL());
}
+IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageBrowserTest, HarmfulProceed) {
+ GURL url = SetupWarningAndNavigate(SB_THREAT_TYPE_URL_HARMFUL);
+
+ EXPECT_TRUE(ClickAndWaitForDetach("proceed-link"));
+ AssertNoInterstitial(true); // Assert the interstitial is gone.
+ EXPECT_EQ(url,
+ browser()->tab_strip_model()->GetActiveWebContents()->GetURL());
+}
+
IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageBrowserTest,
MalwareIframeDontProceed) {
#if defined(OS_WIN) && defined(USE_ASH)
« no previous file with comments | « chrome/browser/safe_browsing/safe_browsing_blocking_page.cc ('k') | tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698