Don't call NP_Shutdown in FreePluginLibraryTask if the library has already been reloaded.

webkit/tools/test_shell/plugin_tests.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
@@ skipping 109 matching lines @@
   test_shell_->webView()->mainFrame()->executeScript(refresh);
   test_shell_->webView()->mainFrame()->executeScript(call_check);
   text = test_shell_->webView()->mainFrame()->contentAsText(10000).utf8();
   ASSERT_EQ(text, "DONE");
 }
 
 // Tests that if a frame is deleted as a result of calling NPP_HandleEvent, we
 // don't crash.
 TEST_F(PluginTest, DeleteFrameDuringEvent) {
   FilePath test_html = data_dir_;
-  test_html = test_html.AppendASCII("plugins");
+  test_html = test_html.AppendASCII(TEST_PLUGIN_DIRECTORY);
   test_html = test_html.AppendASCII("delete_frame.html");
   test_shell_->LoadFile(test_html);
   test_shell_->WaitTestFinished();
 
   WebKit::WebMouseEvent input;
   input.button = WebKit::WebMouseEvent::ButtonLeft;
   input.x = 50;
   input.y = 50;
   input.type = WebKit::WebInputEvent::MouseUp;
   test_shell_->webView()->handleInputEvent(input);
 
   // No crash means we passed.
 }
 
+// Tests that a forced reload of the plugin will not crash.
+TEST_F(PluginTest, ForceReload) {
+  FilePath test_html = data_dir_;
+  test_html = test_html.AppendASCII(TEST_PLUGIN_DIRECTORY);
+  test_html = test_html.AppendASCII("force_reload.html");
+  test_shell_->LoadFile(test_html);
+  test_shell_->WaitTestFinished();
+
+  // No crash means we passed.
+}
+
 #if defined(OS_WIN)
 BOOL CALLBACK EnumChildProc(HWND hwnd, LPARAM lparam) {
   HWND* plugin_hwnd = reinterpret_cast<HWND*>(lparam);
   if (*plugin_hwnd) {
     // More than one child window found, unexpected.
     plugin_hwnd = NULL;
     return FALSE;
   }
   *plugin_hwnd = hwnd;
   return TRUE;
 }
 
 // Tests that hiding/showing the parent frame hides/shows the plugin.
 TEST_F(PluginTest, PluginVisibilty) {
   FilePath test_html = data_dir_;
-  test_html = test_html.AppendASCII("plugins");
+  test_html = test_html.AppendASCII(TEST_PLUGIN_DIRECTORY);
   test_html = test_html.AppendASCII("plugin_visibility.html");
   test_shell_->LoadFile(test_html);
   test_shell_->WaitTestFinished();
 
   WebFrame* main_frame = test_shell_->webView()->mainFrame();
   HWND frame_hwnd = test_shell_->webViewWnd();
   HWND plugin_hwnd = NULL;
   EnumChildWindows(frame_hwnd, EnumChildProc,
       reinterpret_cast<LPARAM>(&plugin_hwnd));
   ASSERT_TRUE(plugin_hwnd != NULL);
   ASSERT_FALSE(IsWindowVisible(plugin_hwnd));
 
   main_frame->executeScript(WebString::fromUTF8("showPlugin(true)"));
   ASSERT_TRUE(IsWindowVisible(plugin_hwnd));
 
   main_frame->executeScript(WebString::fromUTF8("showFrame(false)"));
   ASSERT_FALSE(IsWindowVisible(plugin_hwnd));
 
   main_frame->executeScript(WebString::fromUTF8("showFrame(true)"));
   ASSERT_TRUE(IsWindowVisible(plugin_hwnd));
 }
 #endif
 #endif //!ARCH_CPU_64_BITS