summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-28 19:41:58 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-28 19:41:58 +0000
commit4044e353068f6f5be8b7a0d8d8a2bc204a9910c6 (patch)
treeb2c8882af0ec02177c910caaad57776bafdecf52 /chrome
parentc1edf2958e6b67b7fc083658d5fc73e0dc59b20f (diff)
downloadchromium_src-4044e353068f6f5be8b7a0d8d8a2bc204a9910c6.zip
chromium_src-4044e353068f6f5be8b7a0d8d8a2bc204a9910c6.tar.gz
chromium_src-4044e353068f6f5be8b7a0d8d8a2bc204a9910c6.tar.bz2
Linux: Mark ExtensionBrowserTest.PluginLoadUnload as flaky.
BUG=47598 TEST=none Review URL: http://codereview.chromium.org/2825025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51023 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/extensions/extension_browsertests_misc.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_browsertests_misc.cc b/chrome/browser/extensions/extension_browsertests_misc.cc
index c11cff3..c5bceb5a 100644
--- a/chrome/browser/extensions/extension_browsertests_misc.cc
+++ b/chrome/browser/extensions/extension_browsertests_misc.cc
@@ -708,8 +708,11 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, WindowOpenNoPrivileges) {
EXPECT_TRUE(result);
}
-#if defined(OS_WIN) || defined(OS_LINUX)
+#if defined(OS_WIN)
#define MAYBE_PluginLoadUnload PluginLoadUnload
+#elif defined(OS_LINUX)
+// http://crbug.com/47598
+#define MAYBE_PluginLoadUnload FLAKY_PluginLoadUnload
#else
// TODO(mpcomplete): http://crbug.com/29900 need cross platform plugin support.
#define MAYBE_PluginLoadUnload DISABLED_PluginLoadUnload