summaryrefslogtreecommitdiffstats
path: root/chrome/browser/plugin_test.cc
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-15 19:31:18 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-15 19:31:18 +0000
commit90d570a7cd5ad1c861a7387875e00b4b053a7fc8 (patch)
tree4745f4eb8721e9634f332a2af9696e275e4b85ff /chrome/browser/plugin_test.cc
parentfbf211766cad40ac8c6002e9f7959c5a09e4503d (diff)
downloadchromium_src-90d570a7cd5ad1c861a7387875e00b4b053a7fc8.zip
chromium_src-90d570a7cd5ad1c861a7387875e00b4b053a7fc8.tar.gz
chromium_src-90d570a7cd5ad1c861a7387875e00b4b053a7fc8.tar.bz2
Flakiness cleanup: disable flaky tests under chrome/browser/
Part 2 of what looks like it'll be 3 or 4. See https://groups.google.com/a/chromium.org/group/chromium-dev/browse_thread/thread/fcec09fc659f39a6 BUG=89173,43586,88318,79074,76170,62772,69390,62311,88834,102030,62311,60071,113057,55915,53926,74554,47228,96459,85863,61619,102094,48833,61619,50648,22111 Review URL: https://chromiumcodereview.appspot.com/9348108 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122124 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/plugin_test.cc')
-rw-r--r--chrome/browser/plugin_test.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/plugin_test.cc b/chrome/browser/plugin_test.cc
index 0a4ccc1..88cdfd2 100644
--- a/chrome/browser/plugin_test.cc
+++ b/chrome/browser/plugin_test.cc
@@ -139,7 +139,7 @@ TEST_F(PluginTest, Flash) {
#elif defined(OS_POSIX)
"libflashplayer.so"
#endif
- ;
+ "";
TestPlugin("flash.html", kFlashQuery,
TestTimeouts::action_max_timeout_ms(), false);
}
@@ -170,7 +170,7 @@ TEST_F(ClickToPlayPluginTest, Flash) {
#if defined(OS_WIN)
// Flaky on Windows, see http://crbug.com/113057
-#define MAYBE_FlashDocument FLAKY_FlashDocument
+#define MAYBE_FlashDocument DISABLED_FlashDocument
#else
#define MAYBE_FlashDocument FlashDocument
#endif
@@ -207,7 +207,7 @@ TEST_F(PluginTest, DISABLED_FlashSecurity) {
// TODO(port) Port the following tests to platforms that have the required
// plugins.
// Flaky: http://crbug.com/55915
-TEST_F(PluginTest, FLAKY_Quicktime) {
+TEST_F(PluginTest, DISABLED_Quicktime) {
TestPlugin("quicktime.html", "",
TestTimeouts::action_max_timeout_ms(), false);
}
@@ -234,7 +234,7 @@ TEST_F(PluginTest, FlashOctetStream) {
#if defined(OS_WIN)
// http://crbug.com/53926
-TEST_F(PluginTest, FLAKY_FlashLayoutWhilePainting) {
+TEST_F(PluginTest, DISABLED_FlashLayoutWhilePainting) {
#else
TEST_F(PluginTest, FlashLayoutWhilePainting) {
#endif