diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-20 17:21:09 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-20 17:21:09 +0000 |
| commit | ef8c7d49f0efe5100d44fa3b380efcb82dfad8d8 (patch) | |
| tree | ffe4eb52581054aab666a488d53556bc80d869a6 /content/browser/plugin_browsertest.cc | |
| parent | d5f471e96de10c8f57797947c3ed0a3088d03b9e (diff) | |
| download | chromium_src-ef8c7d49f0efe5100d44fa3b380efcb82dfad8d8.zip chromium_src-ef8c7d49f0efe5100d44fa3b380efcb82dfad8d8.tar.gz chromium_src-ef8c7d49f0efe5100d44fa3b380efcb82dfad8d8.tar.bz2 | |
Don't run PluginTest.DeletePluginInDeallocate on mac debug since it asserts
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133216 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/plugin_browsertest.cc')
| -rw-r--r-- | content/browser/plugin_browsertest.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/content/browser/plugin_browsertest.cc b/content/browser/plugin_browsertest.cc index b3c0663..e8845b6 100644 --- a/content/browser/plugin_browsertest.cc +++ b/content/browser/plugin_browsertest.cc @@ -207,10 +207,13 @@ IN_PROC_BROWSER_TEST_F(PluginTest, SelfDeletePluginInNewStream) { LoadAndWait(GetURL("self_delete_plugin_stream.html"), "OK"); } +// This test asserts on Mac in plugin_host in the NPNVWindowNPObject case. +#if !(defined(OS_MACOSX) && !defined(NDEBUG)) // If this test flakes use http://crbug.com/95558. IN_PROC_BROWSER_TEST_F(PluginTest, DeletePluginInDeallocate) { LoadAndWait(GetURL("plugin_delete_in_deallocate.html"), "OK"); } +#endif #if defined(OS_WIN) |