diff options
author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-13 18:47:31 +0000 |
---|---|---|
committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-13 18:47:31 +0000 |
commit | 5c65e10ad600bf4786f9eb8f6f30872bc61231e3 (patch) | |
tree | b78c3d0cd5fc6b48100e04869f8867749e8e2272 /chrome/test/plugin | |
parent | 6cc8682cb8cc6439976e480992b9dbb27877dee3 (diff) | |
download | chromium_src-5c65e10ad600bf4786f9eb8f6f30872bc61231e3.zip chromium_src-5c65e10ad600bf4786f9eb8f6f30872bc61231e3.tar.gz chromium_src-5c65e10ad600bf4786f9eb8f6f30872bc61231e3.tar.bz2 |
Relanding the following revisions.
r13555
Log:
Remove the Activex shim registration for generic Activex controls. The Activex shim only handles windows media
player in the wild and will continue to do so for the forseeable future.
This fixes http://code.google.com/p/chromium/issues/detail?id=8584, which is basically related to our NPAPI plugin
installer not getting instantiated on pages which instantiated flash using an object tag, which would result in
webkit attempting to instantiate the activex shim. The shim only loads the windows media player classid, thus causing
this issue.
Added a test shell test which tests whether the default plugin loaded correctly. This is done by attempting to instantiate
a special mime type application/chromium-test-default-plugin, which serves as an indicator to the default plugin to
call a function in the page indicating that the test succeeded. I also made a change to ensure that the default plugin
is loaded in test_shell_tests.
Removed the activexshim dll project from chrome.sln
Bug=8584
New Revision: 13558
Log:
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.
The other changes are to ensure that the default plugin is only enabled in test_shell for windows for now.
Bug=8584
Review URL: http://codereview.chromium.org/72004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13610 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); } |