diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-24 21:43:33 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-24 21:43:33 +0000 |
| commit | 72dda10dc446c6c048b91a58648d0784780cf308 (patch) | |
| tree | 5646537bbe2c737b96cb9838aebfb16cafd30927 | |
| parent | 773b636acde3e4435e8597587b4d50409a1d3865 (diff) | |
| download | chromium_src-72dda10dc446c6c048b91a58648d0784780cf308.zip chromium_src-72dda10dc446c6c048b91a58648d0784780cf308.tar.gz chromium_src-72dda10dc446c6c048b91a58648d0784780cf308.tar.bz2 | |
Use the upstream test plugin in test_shell.
BUG=64260
Review URL: http://codereview.chromium.org/5334006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67321 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | webkit/tools/test_shell/test_shell.cc | 9 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell.gypi | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc index 0b6171d..ab95653 100644 --- a/webkit/tools/test_shell/test_shell.cc +++ b/webkit/tools/test_shell/test_shell.cc @@ -877,11 +877,12 @@ bool GetFontTable(int fd, uint32_t table, uint8_t* output, void GetPlugins(bool refresh, std::vector<WebPluginInfo>* plugins) { NPAPI::PluginList::Singleton()->GetPlugins(refresh, plugins); - // Don't load the upstream TestNetscapePlugIn, we're not ready for it yet. + // Don't load the forked TestNetscapePlugIn in the chromium code, use + // the copy in webkit.org's repository instead. const FilePath::StringType kPluginBlackList[] = { - FILE_PATH_LITERAL("npTestNetscapePlugIn.dll"), - FILE_PATH_LITERAL("WebKitTestNetscapePlugIn.plugin"), - FILE_PATH_LITERAL("libTestNetscapePlugIn.so"), + FILE_PATH_LITERAL("npapi_layout_test_plugin.dll"), + FILE_PATH_LITERAL("TestNetscapePlugIn.plugin"), + FILE_PATH_LITERAL("libnpapi_layout_test_plugin.so"), }; for (int i = plugins->size() - 1; i >= 0; --i) { WebPluginInfo plugin_info = plugins->at(i); diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi index dca16c1..935cbae 100644 --- a/webkit/tools/test_shell/test_shell.gypi +++ b/webkit/tools/test_shell/test_shell.gypi @@ -215,8 +215,8 @@ '<(DEPTH)/net/net.gyp:net_test_support', '<(DEPTH)/skia/skia.gyp:skia', '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa', + '<(DEPTH)/third_party/WebKit/WebKit/chromium/WebKit.gyp:copy_TestNetscapePlugIn', '<(DEPTH)/tools/imagediff/image_diff.gyp:image_diff', - '<(DEPTH)/webkit/support/webkit_support.gyp:copy_npapi_layout_test_plugin', ], 'defines': [ # Technically not a unit test but require functions available only to |