diff options
| author | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-19 09:17:14 +0000 |
|---|---|---|
| committer | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-19 09:17:14 +0000 |
| commit | 106505e9cbb8fe23d2a3f059be501207f430763b (patch) | |
| tree | 5c70be9a37679d973ba8e642f08bd63c7f8a19a2 /chrome | |
| parent | a1e81fef83593fbf5159ca1d7c8e88508dd94ae8 (diff) | |
| download | chromium_src-106505e9cbb8fe23d2a3f059be501207f430763b.zip chromium_src-106505e9cbb8fe23d2a3f059be501207f430763b.tar.gz chromium_src-106505e9cbb8fe23d2a3f059be501207f430763b.tar.bz2 | |
Try re-enabling for Mac now that the base bug is allegedly fixed.
BUG=68751
TEST=mac passes
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71772 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/test/plugin/plugin_test.cpp | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/chrome/test/plugin/plugin_test.cpp b/chrome/test/plugin/plugin_test.cpp index f7df668..850c621 100644 --- a/chrome/test/plugin/plugin_test.cpp +++ b/chrome/test/plugin/plugin_test.cpp @@ -125,12 +125,7 @@ class PluginTest : public UITest { } }; -// http://crbug.com/68751 -#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 @@ -154,12 +149,7 @@ class ClickToPlayPluginTest : public PluginTest { } }; -// http://crbug.com/68751 -#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, @@ -176,12 +166,7 @@ TEST_F(ClickToPlayPluginTest, Flash) { WaitForFinish(action_max_timeout_ms(), true); } -// http://crbug.com/68751 -#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, |