diff options
| -rw-r--r-- | chrome/test/plugin/plugin_test.cpp | 9 | ||||
| -rw-r--r-- | webkit/glue/plugins/plugin_list.cc | 4 | ||||
| -rw-r--r-- | webkit/glue/plugins/plugin_list_win.cc | 5 |
3 files changed, 14 insertions, 4 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. diff --git a/webkit/glue/plugins/plugin_list.cc b/webkit/glue/plugins/plugin_list.cc index cfc397b..115d382 100644 --- a/webkit/glue/plugins/plugin_list.cc +++ b/webkit/glue/plugins/plugin_list.cc @@ -156,8 +156,6 @@ void PluginList::LoadPlugins(bool refresh) { base::TimeTicks start_time = base::TimeTicks::Now(); - LoadInternalPlugins(); - std::vector<FilePath> directories_to_scan; GetPluginDirectories(&directories_to_scan); @@ -175,6 +173,8 @@ void PluginList::LoadPlugins(bool refresh) { if (webkit_glue::IsDefaultPluginEnabled()) LoadPlugin(FilePath(kDefaultPluginLibraryName)); + LoadInternalPlugins(); + base::TimeTicks end_time = base::TimeTicks::Now(); base::TimeDelta elapsed = end_time - start_time; DLOG(INFO) << "Loaded plugin list in " << elapsed.InMilliseconds() << " ms."; diff --git a/webkit/glue/plugins/plugin_list_win.cc b/webkit/glue/plugins/plugin_list_win.cc index ebe5312..94104c8 100644 --- a/webkit/glue/plugins/plugin_list_win.cc +++ b/webkit/glue/plugins/plugin_list_win.cc @@ -216,8 +216,9 @@ void PluginList::PlatformInit() { L"1, 0, 0, 1", L"application/x-ms-wmp|application/asx|video/x-ms-asf-plugin|" L"application/x-mplayer2|video/x-ms-asf|video/x-ms-wm|audio/x-ms-wma|" - L"audio/x-ms-wax|video/x-ms-wmv|video/x-ms-wvx", - L"*|*|*|*|asf,asx,*|wm,*|wma,*|wax,*|wmv,*|wvx,*", + L"audio/x-ms-wax|video/x-ms-wmv|video/x-ms-wvx|audio/mpeg|video/mpeg", + L"*|*|*|*|asf,asx,*|wm,*|wma,*|wax,*|wmv,*|wvx,*|mp2,mp3,mpa,mpeg,mpg|" + L"mpeg,mpg,m1v,mpe", L"", { activex_shim::ActiveX_Shim_NP_GetEntryPoints, |