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

Unified Diff: chrome/browser/download/download_browsertest.cc

Issue 1322033003: Stop compiling dead download infobar code on desktop Chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix gn Created 5 years, 4 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 | « chrome/browser/download/OWNERS ('k') | chrome/browser/download/download_request_limiter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/download/download_browsertest.cc
diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc
index d39f9fa85a4133d7d7ca1fa67f940ce49f01c946..3d74c55abdba055b9f410ee9a53b1d1399304224 100644
--- a/chrome/browser/download/download_browsertest.cc
+++ b/chrome/browser/download/download_browsertest.cc
@@ -2753,15 +2753,10 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, SaveImageAsReferrerPolicyDefault) {
EXPECT_TRUE(VerifyFile(file, "", 0));
}
-// Verify the multiple downloads infobar.
+// On mobile, the multiple downloads UI is an infobar. On desktop, it's a
+// bubble. Test each as appropriate.
+#if defined(OS_ANDROID) || defined(OS_IOS)
IN_PROC_BROWSER_TEST_F(DownloadTest, TestMultipleDownloadsInfobar) {
-#if defined(OS_WIN) && defined(USE_ASH)
- // Disable this test in Metro+Ash for now (http://crbug.com/262796).
- if (base::CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kAshBrowserTests))
- return;
-#endif
-
// Ensure that infobars are being used instead of bubbles.
base::CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kDisablePermissionsBubbles);
@@ -2805,7 +2800,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, TestMultipleDownloadsInfobar) {
EXPECT_EQ(2u, downloads_observer->NumDownloadsSeenInState(
DownloadItem::COMPLETE));
}
-
+#else
IN_PROC_BROWSER_TEST_F(DownloadTest, TestMultipleDownloadsBubble) {
#if defined(OS_WIN) && defined(USE_ASH)
// Disable this test in Metro+Ash for now (http://crbug.com/262796).
@@ -2814,11 +2809,6 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, TestMultipleDownloadsBubble) {
return;
#endif
-#if defined(OS_ANDROID) || defined(OS_IOS)
- // Permission bubbles are not supported on mobile.
- return;
-#endif
-
// Enable permision bubbles.
base::CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kEnablePermissionsBubbles);
@@ -2846,6 +2836,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, TestMultipleDownloadsBubble) {
browser()->tab_strip_model()->GetActiveWebContents()->Close();
}
+#endif
IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadTest_Renaming) {
GURL url = net::URLRequestMockHTTPJob::GetMockUrl("downloads/a_zip_file.zip");
« no previous file with comments | « chrome/browser/download/OWNERS ('k') | chrome/browser/download/download_request_limiter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698