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

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

Issue 26622003: linux_aura: Turn it on again. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to ToT and test against the recently committed nacl patch. Created 7 years, 1 month 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/apps/app_browsertest.cc ('k') | chrome/browser/errorpage_browsertest.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 f3629d71e5445f89097fe4c91ec4b4245904bdf1..6635cde65fc01e3d5051102fc42136bb7f183948 100644
--- a/chrome/browser/download/download_browsertest.cc
+++ b/chrome/browser/download/download_browsertest.cc
@@ -3058,7 +3058,14 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, MAYBE_DownloadTest_PercentComplete) {
false));
}
-IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadTest_DenyDanger) {
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA)
+// TODO(erg): linux_aura bringup: http://crbug.com/163931
+#define MAYBE_DownloadTest_DenyDanger DISABLED_DownloadTest_DenyDanger
+#else
+#define MAYBE_DownloadTest_DenyDanger DownloadTest_DenyDanger
+#endif
+
+IN_PROC_BROWSER_TEST_F(DownloadTest, MAYBE_DownloadTest_DenyDanger) {
ASSERT_TRUE(test_server()->Start());
GURL url(test_server()->GetURL("files/downloads/dangerous/dangerous.crx"));
scoped_ptr<content::DownloadTestObserver> observer(
« no previous file with comments | « chrome/browser/apps/app_browsertest.cc ('k') | chrome/browser/errorpage_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698