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

Unified Diff: webkit/tools/test_shell/plugin_tests.cc

Issue 5020001: Don't call NP_Shutdown in FreePluginLibraryTask if the library has already been reloaded. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 1 month 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/glue/plugins/plugin_lib.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/tools/test_shell/plugin_tests.cc
===================================================================
--- webkit/tools/test_shell/plugin_tests.cc (revision 66158)
+++ webkit/tools/test_shell/plugin_tests.cc (working copy)
@@ -127,7 +127,7 @@
// 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();
@@ -142,6 +142,17 @@
// 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);
@@ -157,7 +168,7 @@
// 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();
« no previous file with comments | « webkit/glue/plugins/plugin_lib.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698