Add a mimetype to npapi_test_plugin so we pass a layout test

that expects each plugin to have at least one mime type.

Also remove some test code that deletes a plugin during teardown.
This  is no longer needed and can break some tests that run later.

BUG=51402

Review URL: http://codereview.chromium.org/3076041

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55358 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 11 insertions, 7 deletions

diff --git a/webkit/glue/plugins/test/npapi_test.cc b/webkit/glue/plugins/test/npapi_test.cc
index d7c4fa7..1b2baa1 100644
--- a/webkit/glue/plugins/test/npapi_test.cc
+++ b/webkit/glue/plugins/test/npapi_test.cc
@@ -73,6 +73,17 @@ EXPORT NPError API_CALL NP_Initialize(NPNetscapeFuncs* pFuncs) {
 EXPORT NPError API_CALL NP_Shutdown() {
   return NPAPIClient::PluginClient::Shutdown();
 }
+
+#if defined(OS_POSIX) && !defined(OS_MACOSX)
+EXPORT const char* API_CALL NP_GetMIMEDescription(void) {
+  // 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.  We specify a mimetype here so
+  // this plugin has at least one.
+  return "application/x-npapi-test-netscape:npapitestnetscape:"
+         "npapi test netscape content";
+}
+#endif
 } // extern "C"
 
 namespace WebCore {
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 9ed7f3c..0ca4cc3 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -4,5 +4,3 @@
 //
 // Only add expectations here to temporarily suppress messages on the bots
 // until the changes can be landed upstream.
-
-BUG51402 LINUX DEBUG : fast/js/navigator-mimeTypes-length.html = TEXT
diff --git a/webkit/tools/test_shell/plugin_tests.cc b/webkit/tools/test_shell/plugin_tests.cc
index aed5dc5..ef1d8f0 100644
--- a/webkit/tools/test_shell/plugin_tests.cc
+++ b/webkit/tools/test_shell/plugin_tests.cc
@@ -69,11 +69,6 @@ class PluginTest : public TestShellTest {
     TestShellTest::SetUp();
   }
 
-  virtual void TearDown() {
-    DeleteTestPlugin();
-    TestShellTest::TearDown();
-  }
-
   FilePath plugin_src_;
   FilePath plugin_file_path_;
 };