summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions
diff options
context:
space:
mode:
authorfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-01 20:55:44 +0000
committerfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-01 20:55:44 +0000
commitf4473010ca2e342648817444d55563b23a938261 (patch)
treef8a91893933f0d2d7f5911587221a39f2de2b1e8 /chrome/browser/extensions
parent82e1e1135c3565a0064761d8a4d919d414446d99 (diff)
downloadchromium_src-f4473010ca2e342648817444d55563b23a938261.zip
chromium_src-f4473010ca2e342648817444d55563b23a938261.tar.gz
chromium_src-f4473010ca2e342648817444d55563b23a938261.tar.bz2
Mark a test as flaky on ChromeOS.
BUG=40141 TEST=None Review URL: http://codereview.chromium.org/1575015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43384 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
-rw-r--r--chrome/browser/extensions/extension_infobar_apitest.cc10
1 files changed, 8 insertions, 2 deletions
diff --git a/chrome/browser/extensions/extension_infobar_apitest.cc b/chrome/browser/extensions/extension_infobar_apitest.cc
index 776b3a2..ff2bfc12 100644
--- a/chrome/browser/extensions/extension_infobar_apitest.cc
+++ b/chrome/browser/extensions/extension_infobar_apitest.cc
@@ -7,10 +7,16 @@
#include "chrome/common/chrome_switches.h"
#if defined(TOOLKIT_VIEWS)
-// Need to port ExtensionInfoBarDelegate::CreateInfoBar() to other platforms.
-// See http://crbug.com/39916 for details.
+#if defined (OS_WIN)
#define MAYBE_Infobars Infobars
#else
+// Flaky on ChromeOS, see http://crbug.com/40141.
+#define MAYBE_Infobars FLAKY_Infobars
+#endif
+
+#else
+// Need to port ExtensionInfoBarDelegate::CreateInfoBar() to other platforms.
+// See http://crbug.com/39916 for details.
#define MAYBE_Infobars DISABLED_Infobars
#endif