From a8f63adbb9cc876835290167f9cd1f221d46932e Mon Sep 17 00:00:00 2001 From: "tony@chromium.org" Date: Wed, 12 Jan 2011 22:23:15 +0000 Subject: Blacklist WebKitTestNetscapePlugIn so we can rename the plugin to TestNetscapePlugIn. After webkit r75561, both plugins are the same so we can now delete WebKitTestNetscapePlugIn. TEST=plugin layout tests still pass Review URL: http://codereview.chromium.org/6158007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71247 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/support/webkit_support_glue.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'webkit/support') 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* 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) { -- cgit v1.1