summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authortwiz@chromium.org <twiz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-05 23:46:16 +0000
committertwiz@chromium.org <twiz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-05 23:46:16 +0000
commitb184ddebb9646658091716dc330a0098a7e23800 (patch)
tree5be33b54b7f6d69d84103301110d27f3d5ee7341 /chrome/browser
parent44ad10e6d98ff5d9a41e7ceb69e812a5f8815d88 (diff)
downloadchromium_src-b184ddebb9646658091716dc330a0098a7e23800.zip
chromium_src-b184ddebb9646658091716dc330a0098a7e23800.tar.gz
chromium_src-b184ddebb9646658091716dc330a0098a7e23800.tar.bz2
Disable ExtensionApiTest.Infobars on Mac, as it is flaky.
BUG=60990 TEST=ExtensionApiTest.Infobars Review URL: http://codereview.chromium.org/6798005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80553 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/extensions/extension_infobar_apitest.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_infobar_apitest.cc b/chrome/browser/extensions/extension_infobar_apitest.cc
index 98299f9..0d7ce74 100644
--- a/chrome/browser/extensions/extension_infobar_apitest.cc
+++ b/chrome/browser/extensions/extension_infobar_apitest.cc
@@ -6,10 +6,11 @@
#include "chrome/browser/extensions/extension_apitest.h"
#include "chrome/common/chrome_switches.h"
-#if defined(TOOLKIT_VIEWS) || defined(OS_MACOSX)
+#if defined(TOOLKIT_VIEWS)
#define MAYBE_Infobars Infobars
#else
// Need to finish port to Linux. See http://crbug.com/39916 for details.
+// Also disabled on mac. See http://crbug.com/60990.
#define MAYBE_Infobars DISABLED_Infobars
#endif