Use the upstream test plugin in test_shell.

Use the upstream test plugin in test_shell.

BUG=64260
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=67321

[ojan, 2010-11-24 19:11:22]

LGTM

On Wed, Nov 24, 2010 at 11:07 AM, <tony@chromium.org> wrote:

> Reviewers: ojan, Kent Tamura, Dimitri Glazkov,
>
> Description:
> Use the upstream test plugin in test_shell.
>
> BUG=64260
>
> Please review this at http://codereview.chromium.org/5334006/
>
> SVN Base: svn://svn.chromium.org/chrome/trunk/src
>
> Affected files:
>  M webkit/tools/test_shell/test_shell.cc
>  M webkit/tools/test_shell/test_shell.gypi
>
>
> Index: webkit/tools/test_shell/test_shell.cc
> diff --git a/webkit/tools/test_shell/test_shell.cc
> b/webkit/tools/test_shell/test_shell.cc
> index
>
0b6171dc4ec19d6d930486fd42cf04c4672d5745..ab956532ece7d42e2dac265a35e55a7a3675dc12
> 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);
> Index: webkit/tools/test_shell/test_shell.gypi
> diff --git a/webkit/tools/test_shell/test_shell.gypi
> b/webkit/tools/test_shell/test_shell.gypi
> index
>
dca16c1da28d4aedbad9b6d78d82189600e49b72..935cbae51ab2aac7d3602cc001381d0299689ebc
> 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
>
>
>