| 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();
|
|
|