The test was failing because the ui_test run before it failed to delete the test plugin (it must have still been locked by the browser process). As a result, test_shell_tests loaded that plugin into its plugin info cache.

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

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

1 files changed, 13 insertions, 7 deletions

diff --git a/webkit/tools/test_shell/plugin_tests.cc b/webkit/tools/test_shell/plugin_tests.cc
index 64824e4..d5ac5ca 100644
--- a/webkit/tools/test_shell/plugin_tests.cc
+++ b/webkit/tools/test_shell/plugin_tests.cc
@@ -45,7 +45,7 @@ class PluginTest : public TestShellTest {
 };
 
 // Tests navigator.plugins.refresh() works.
-TEST_F(PluginTest, DISABLED_Refresh) {
+TEST_F(PluginTest, Refresh) {
   std::string html = "\
       <div id='result'>Test running....</div>\
       <script>\
@@ -65,17 +65,23 @@ TEST_F(PluginTest, DISABLED_Refresh) {
       </script>\
       ";
 
-  DeleteTestPlugin();  // Remove any leftover from previous tests if they exist.
-  test_shell_->webView()->GetMainFrame()->LoadHTMLString(
-      html, GURL("about:blank"));
-  test_shell_->WaitTestFinished();
-
-  std::wstring text;
   WebScriptSource call_check(
       WebString::fromUTF8("check();"));
   WebScriptSource refresh(
       WebString::fromUTF8("navigator.plugins.refresh(false)"));
 
+  // Remove any leftover from previous tests if they exist.  We must also
+  // refresh WebKit's plugin cache since it might have had an entry for the
+  // test plugin from a previous test.
+  DeleteTestPlugin();
+  ASSERT_FALSE(file_util::PathExists(plugin_file_path_));
+  test_shell_->webView()->GetMainFrame()->ExecuteScript(refresh);
+
+  test_shell_->webView()->GetMainFrame()->LoadHTMLString(
+      html, GURL("about:blank"));
+  test_shell_->WaitTestFinished();
+
+  std::wstring text;
   test_shell_->webView()->GetMainFrame()->ExecuteScript(call_check);
   test_shell_->webView()->GetMainFrame()->GetContentAsPlainText(10000, &text);
   ASSERT_EQ(text, L"FAIL");