Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(251)

Unified Diff: webkit/tools/npapi_layout_test_plugin/main.cpp

Issue 149146: linux: fix a layout test by having our test plugin provide two mimetypes (Closed)
Patch Set: Created 11 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/tools/layout_tests/test_expectations.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/tools/npapi_layout_test_plugin/main.cpp
diff --git a/webkit/tools/npapi_layout_test_plugin/main.cpp b/webkit/tools/npapi_layout_test_plugin/main.cpp
index a85af00eaad3834c454115d06491e4cea46382d6..16190db4797e8331ebad37f770d98174eada9e47 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
« no previous file with comments | « webkit/tools/layout_tests/test_expectations.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698