diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-03 01:29:57 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-03 01:29:57 +0000 |
| commit | 740a9846504e7b29a24d68cd9044c8e5d8fb2083 (patch) | |
| tree | b6be04d247c67dfedb6db3fb494e9dc131ae85bf /webkit/tools/npapi_layout_test_plugin | |
| parent | 6a14f0457287adcd1dbf45cec6e758af0f9e0b7c (diff) | |
| download | chromium_src-740a9846504e7b29a24d68cd9044c8e5d8fb2083.zip chromium_src-740a9846504e7b29a24d68cd9044c8e5d8fb2083.tar.gz chromium_src-740a9846504e7b29a24d68cd9044c8e5d8fb2083.tar.bz2 | |
linux: fix a layout test by having our test plugin provide two mimetypes
The layout test LayoutTests/fast/js/navigator-mimeTypes-length.html asserts
that the number of mimetypes handled by plugins should be greater than the
number of plugins. This isn't true if the layout test plugin is the only
plugin and it only handles one mimetype, so we make it handle an additional
fake mimetype.
Review URL: http://codereview.chromium.org/149146
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19881 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/npapi_layout_test_plugin')
| -rw-r--r-- | webkit/tools/npapi_layout_test_plugin/main.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/webkit/tools/npapi_layout_test_plugin/main.cpp b/webkit/tools/npapi_layout_test_plugin/main.cpp index a85af00..16190db 100644 --- a/webkit/tools/npapi_layout_test_plugin/main.cpp +++ b/webkit/tools/npapi_layout_test_plugin/main.cpp @@ -497,6 +497,12 @@ NPError NP_GetValue(NPP instance, NPPVariable variable, void *value) } const char* NP_GetMIMEDescription(void) { - return "application/x-webkit-test-netscape:testnetscape:test netscape content"; + // The layout test LayoutTests/fast/js/navigator-mimeTypes-length.html + // asserts that the number of mimetypes handled by plugins should be + // greater than the number of plugins. This isn't true if we're + // the only plugin and we only handle one mimetype, so specify + // multiple mimetypes here. + return "application/x-webkit-test-netscape:testnetscape:test netscape content;" + "application/x-webkit-test-netscape2:testnetscape2:test netscape content2"; } #endif |