Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(551)

Unified Diff: chrome/test/plugin/plugin_test.cpp

Issue 6002019: Disable plugin tests on mac. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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,
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698