summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions
diff options
context:
space:
mode:
authorJohn Abd-El-Malek <jam@chromium.org>2014-10-02 13:53:41 -0700
committerJohn Abd-El-Malek <jam@chromium.org>2014-10-02 20:55:22 +0000
commit30522c0bd0c4d8386fe081ad00f449d563d4a275 (patch)
treee501560fd711a0cec9b299b3ba21d6a5ed9f7c5c /chrome/browser/extensions
parentb098afcdc9323e47baa8ad1f268f945a0b7120c3 (diff)
downloadchromium_src-30522c0bd0c4d8386fe081ad00f449d563d4a275.zip
chromium_src-30522c0bd0c4d8386fe081ad00f449d563d4a275.tar.gz
chromium_src-30522c0bd0c4d8386fe081ad00f449d563d4a275.tar.bz2
Correctly disable DownloadExtensionTest.DownloadExtensionTest_AcceptDanger on Mac.
The ifdef was reversed. BUG=180759 TBR=yoz@chromium.org Review URL: https://codereview.chromium.org/620253002 Cr-Commit-Position: refs/heads/master@{#297899}
Diffstat (limited to 'chrome/browser/extensions')
-rw-r--r--chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc b/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc
index 1ac2b66..45e7b49 100644
--- a/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc
+++ b/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc
@@ -4024,9 +4024,9 @@ void OnDangerPromptCreated(DownloadDangerPrompt* prompt) {
#if defined(OS_MACOSX)
// Flakily triggers and assert on Mac.
// http://crbug.com/180759
-#define MAYBE_DownloadExtensionTest_AcceptDanger DownloadExtensionTest_AcceptDanger
-#else
#define MAYBE_DownloadExtensionTest_AcceptDanger DISABLED_DownloadExtensionTest_AcceptDanger
+#else
+#define MAYBE_DownloadExtensionTest_AcceptDanger DownloadExtensionTest_AcceptDanger
#endif
IN_PROC_BROWSER_TEST_F(DownloadExtensionTest,
MAYBE_DownloadExtensionTest_AcceptDanger) {