Index: chrome/test/plugin/plugin_test.cpp |
diff --git a/chrome/test/plugin/plugin_test.cpp b/chrome/test/plugin/plugin_test.cpp |
index e578944fe2d2531e547cee06e9ba6e22ca709b8c..91f61f24ae4cefc14366f1eca2e09e1bf8118841 100644 |
--- a/chrome/test/plugin/plugin_test.cpp |
+++ b/chrome/test/plugin/plugin_test.cpp |
@@ -123,7 +123,11 @@ class PluginTest : public UITest { |
} |
}; |
+#if defined(OS_MACOSX) |
+TEST_F(PluginTest, DISABLED_Flash) { |
+#else |
TEST_F(PluginTest, Flash) { |
+#endif |
// Note: This does not work with the npwrapper on 64-bit Linux. Install the |
// native 64-bit Flash to run the test. |
// TODO(thestig) Update this list if we decide to only test against internal |
@@ -147,7 +151,11 @@ class ClickToPlayPluginTest : public PluginTest { |
} |
}; |
+#if defined(OS_MACOSX) |
+TEST_F(ClickToPlayPluginTest, DISABLED_Flash) { |
+#else |
TEST_F(ClickToPlayPluginTest, Flash) { |
+#endif |
scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); |
ASSERT_TRUE(browser.get()); |
ASSERT_TRUE(browser->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS, |
@@ -164,7 +172,11 @@ TEST_F(ClickToPlayPluginTest, Flash) { |
WaitForFinish(action_max_timeout_ms(), true); |
} |
+#if defined(OS_MACOSX) |
+TEST_F(ClickToPlayPluginTest, DISABLED_FlashDocument) { |
+#else |
TEST_F(ClickToPlayPluginTest, FlashDocument) { |
+#endif |
scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); |
ASSERT_TRUE(browser.get()); |
ASSERT_TRUE(browser->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS, |