diff options
Diffstat (limited to 'chrome/test/plugin/plugin_test.cpp')
| -rw-r--r-- | chrome/test/plugin/plugin_test.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/chrome/test/plugin/plugin_test.cpp b/chrome/test/plugin/plugin_test.cpp index e578944..9aa885f 100644 --- a/chrome/test/plugin/plugin_test.cpp +++ b/chrome/test/plugin/plugin_test.cpp @@ -123,7 +123,12 @@ class PluginTest : public UITest { } }; +// http://crbug.com/68303 +#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 +152,12 @@ class ClickToPlayPluginTest : public PluginTest { } }; +// http://crbug.com/68303 +#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 +174,12 @@ TEST_F(ClickToPlayPluginTest, Flash) { WaitForFinish(action_max_timeout_ms(), true); } +// http://crbug.com/68303 +#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, |