Added audio/mpeg and video/mpeg to the list of mime types supported by the Activex shim for media player along with their associated extensions.

This fixes http://code.google.com/p/chromium/issues/detail?id=11054, which occurs with embed tags with a source
URL and no mime type. In this case the URL extension is mp3, which is not claimed by any plugin although Quicktime
and media player do handle it. It works in Firefox because the plugin instantiation code in FF correctly gets the
mime type from the http stream and instantiates the plugin accordingly. Webkit attempts to instantiate the plugin
from the embed tag with the source URL. This fails silently in Chrome and Safari displays an error message.

With this fix the only user visible difference would be quicktime handling the mp3 in FF and IE, and media player
handling it in Chrome.

I also moved the media player shim to the end of the plugin list to ensure it does not take over the audio/mpeg and video/mpeg mime types if there is a a plugin which can handle it.

Added plugin tests for the mp3 and mpe extensions.

Bug=11054


Review URL: http://codereview.chromium.org/100180

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15008 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 9 insertions, 0 deletions

diff --git a/chrome/test/plugin/plugin_test.cpp b/chrome/test/plugin/plugin_test.cpp
index 27bf7d6..0b8cc9a 100644
--- a/chrome/test/plugin/plugin_test.cpp
+++ b/chrome/test/plugin/plugin_test.cpp
@@ -225,6 +225,15 @@ TEST_F(ActiveXTest, DISABLED_CustomScripting) {
   TestActiveX(L"activex_custom_scripting.html", kShortWaitTimeout, true);
 }
 
+TEST_F(ActiveXTest, EmbeddedMP3) {
+  TestActiveX(L"mp3_test.html", kLongWaitTimeout, false);
+}
+
+TEST_F(ActiveXTest, EmbeddedMPE) {
+  TestActiveX(L"mpe_test.html", kLongWaitTimeout, false);
+}
+
+
 // The default plugin tests defined below rely on the following webkit
 // functions and the IsPluginProcess function which is defined in the global
 // namespace. Stubbed these out for now.