diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-12 22:23:15 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-12 22:23:15 +0000 |
| commit | a8f63adbb9cc876835290167f9cd1f221d46932e (patch) | |
| tree | c22b1ddd12696696ea46d077291e2faf56900097 /webkit/support | |
| parent | b7d43e43c6846deb1933b38d64b379df890da35e (diff) | |
| download | chromium_src-a8f63adbb9cc876835290167f9cd1f221d46932e.zip chromium_src-a8f63adbb9cc876835290167f9cd1f221d46932e.tar.gz chromium_src-a8f63adbb9cc876835290167f9cd1f221d46932e.tar.bz2 | |
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
Diffstat (limited to 'webkit/support')
| -rw-r--r-- | webkit/support/webkit_support_glue.cc | 5 |
1 files changed, 2 insertions, 3 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) { |