1 files changed, 13 insertions, 11 deletions

diff --git a/chrome/test/plugin/plugin_test.cpp b/chrome/test/plugin/plugin_test.cpp
index 0faaf8e..00f2123 100644
--- a/chrome/test/plugin/plugin_test.cpp
+++ b/chrome/test/plugin/plugin_test.cpp
@@ -131,11 +131,13 @@ class PluginTest : public UITest {
   }
 };
 
-TEST_F(PluginTest, Quicktime) {
+// Disabling all tests to make buildbot green. See -
+// http://code.google.com/p/chromium/issues/detail?id=7983
+TEST_F(PluginTest, DISABLED_Quicktime) {
   TestPlugin(L"quicktime.html", kShortWaitTimeout);
 }
 
-TEST_F(PluginTest, MediaPlayerNew) {
+TEST_F(PluginTest, DISABLED_MediaPlayerNew) {
   TestPlugin(L"wmp_new.html", kShortWaitTimeout);
 }
 
@@ -144,27 +146,27 @@ TEST_F(PluginTest, DISABLED_MediaPlayerOld) {
   TestPlugin(L"wmp_old.html", kLongWaitTimeout);
 }
 
-TEST_F(PluginTest, Real) {
+TEST_F(PluginTest, DISABLED_Real) {
   TestPlugin(L"real.html", kShortWaitTimeout);
 }
 
-TEST_F(PluginTest, Flash) {
+TEST_F(PluginTest, DISABLED_Flash) {
   TestPlugin(L"flash.html", kShortWaitTimeout);
 }
 
-TEST_F(PluginTest, FlashOctetStream) {
+TEST_F(PluginTest, DISABLED_FlashOctetStream) {
   TestPlugin(L"flash-octet-stream.html", kShortWaitTimeout);
 }
 
-TEST_F(PluginTest, FlashSecurity) {
+TEST_F(PluginTest, DISABLED_FlashSecurity) {
   TestPlugin(L"flash.html", kShortWaitTimeout);
 }
 
-TEST_F(PluginTest, Java) {
+TEST_F(PluginTest, DISABLED_Java) {
   TestPlugin(L"Java.html", kShortWaitTimeout);
 }
 
-TEST_F(PluginTest, Silverlight) {
+TEST_F(PluginTest, DISABLED_Silverlight) {
   TestPlugin(L"silverlight.html", kShortWaitTimeout);
 }
 
@@ -209,15 +211,15 @@ class ActiveXTest : public PluginTest {
   bool dll_registered;
 };
 
-TEST_F(ActiveXTest, EmbeddedWMP) {
+TEST_F(ActiveXTest, DISABLED_EmbeddedWMP) {
   TestActiveX(L"activex_embedded_wmp.html", kLongWaitTimeout, false);
 }
 
-TEST_F(ActiveXTest, WMP) {
+TEST_F(ActiveXTest, DISABLED_WMP) {
   TestActiveX(L"activex_wmp.html", kLongWaitTimeout, false);
 }
 
-TEST_F(ActiveXTest, CustomScripting) {
+TEST_F(ActiveXTest, DISABLED_CustomScripting) {
   TestActiveX(L"activex_custom_scripting.html", kShortWaitTimeout, true);
 }