diff options
| -rw-r--r-- | webkit/support/webkit_support_glue.cc | 5 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell.cc | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/webkit/support/webkit_support_glue.cc b/webkit/support/webkit_support_glue.cc index 85d09db..3b433a1 100644 --- a/webkit/support/webkit_support_glue.cc +++ b/webkit/support/webkit_support_glue.cc @@ -17,11 +17,10 @@ void GetPlugins(bool refresh, std::vector<webkit::npapi::WebPluginInfo>* plugins) { webkit::npapi::PluginList::Singleton()->GetPlugins(refresh, plugins); // Don't load the forked npapi_layout_test_plugin in DRT, we only want to - // use the upstream version TestNetscapePlugIn (on Mac, the upstream version - // is named WebKitTestNetscapePlugIn). + // use the upstream version TestNetscapePlugIn. const FilePath::StringType kPluginBlackList[] = { FILE_PATH_LITERAL("npapi_layout_test_plugin.dll"), - FILE_PATH_LITERAL("TestNetscapePlugIn.plugin"), + FILE_PATH_LITERAL("WebKitTestNetscapePlugIn.plugin"), FILE_PATH_LITERAL("libnpapi_layout_test_plugin.so"), }; for (int i = plugins->size() - 1; i >= 0; --i) { diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc index a1a6927..e168b55 100644 --- a/webkit/tools/test_shell/test_shell.cc +++ b/webkit/tools/test_shell/test_shell.cc @@ -899,7 +899,7 @@ void GetPlugins(bool refresh, // the copy in webkit.org's repository instead. const FilePath::StringType kPluginBlackList[] = { FILE_PATH_LITERAL("npapi_layout_test_plugin.dll"), - FILE_PATH_LITERAL("TestNetscapePlugIn.plugin"), + FILE_PATH_LITERAL("WebKitTestNetscapePlugIn.plugin"), FILE_PATH_LITERAL("libnpapi_layout_test_plugin.so"), }; for (int i = plugins->size() - 1; i >= 0; --i) { |