diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-11 06:24:44 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-11 06:24:44 +0000 |
| commit | 80be1d88700fff788f873971ee90cba5e813195d (patch) | |
| tree | 65c22e9388787dc360c15839de7586d364d7e44a /chrome/test/plugin | |
| parent | eb169bacbcdd25706efbe7ddd0117e9766496205 (diff) | |
| download | chromium_src-80be1d88700fff788f873971ee90cba5e813195d.zip chromium_src-80be1d88700fff788f873971ee90cba5e813195d.tar.gz chromium_src-80be1d88700fff788f873971ee90cba5e813195d.tar.bz2 | |
Removing the Activex shim plugin from the list of default plugins caused some activex shim tests to fail. This basically fails for pages which instantiate the media player like an activex only. To handle this case we attempt to map the clsid to a NPAPI mime type if possible in the shim. If we succeed then the shim is instantiated as an NPAPI plugin as before. It internally loads the media player activex.
Review URL: http://codereview.chromium.org/66072
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13558 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/plugin')
| -rw-r--r-- | chrome/test/plugin/plugin_test.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/test/plugin/plugin_test.cpp b/chrome/test/plugin/plugin_test.cpp index 77bc77d..27bf7d6 100644 --- a/chrome/test/plugin/plugin_test.cpp +++ b/chrome/test/plugin/plugin_test.cpp @@ -221,7 +221,7 @@ TEST_F(ActiveXTest, WMP) { TestActiveX(L"activex_wmp.html", kLongWaitTimeout, false); } -TEST_F(ActiveXTest, CustomScripting) { +TEST_F(ActiveXTest, DISABLED_CustomScripting) { TestActiveX(L"activex_custom_scripting.html", kShortWaitTimeout, true); } |