summaryrefslogtreecommitdiffstats
path: root/chrome/test/ui/npapi_uitest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/test/ui/npapi_uitest.cc')
-rw-r--r--chrome/test/ui/npapi_uitest.cc16
1 files changed, 14 insertions, 2 deletions
diff --git a/chrome/test/ui/npapi_uitest.cc b/chrome/test/ui/npapi_uitest.cc
index 2ebf2b6..577ac59 100644
--- a/chrome/test/ui/npapi_uitest.cc
+++ b/chrome/test/ui/npapi_uitest.cc
@@ -29,14 +29,15 @@
#include "chrome/test/base/ui_test_utils.h"
#include "chrome/test/ui/npapi_test_helper.h"
#include "content/browser/net/url_request_mock_http_job.h"
+#include "content/common/content_switches.h"
using npapi_test::kTestCompleteCookie;
using npapi_test::kTestCompleteSuccess;
-static const FilePath::CharType* kTestDir = FILE_PATH_LITERAL("npapi");
-
namespace {
+const FilePath::CharType* kTestDir = FILE_PATH_LITERAL("npapi");
+
class NPAPIAutomationEnabledTest : public NPAPIVisiblePluginTester {
public:
NPAPIAutomationEnabledTest() {
@@ -159,6 +160,17 @@ TEST_F(NPAPIVisiblePluginTester, SelfDeletePluginInNewStream) {
TestTimeouts::action_max_timeout_ms());
}
+TEST_F(NPAPIVisiblePluginTester, DeletePluginInDeallocate) {
+ show_window_ = true;
+ const FilePath test_case(
+ FILE_PATH_LITERAL("plugin_delete_in_deallocate.html"));
+ GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case);
+ ASSERT_NO_FATAL_FAILURE(NavigateToURL(url));
+ WaitForFinish("delete_plugin_in_deallocate_test", "signaller", url,
+ kTestCompleteCookie, kTestCompleteSuccess,
+ TestTimeouts::action_max_timeout_ms());
+}
+
#if defined(OS_WIN)
// Tests if a plugin has a non zero window rect.
TEST_F(NPAPIVisiblePluginTester, VerifyPluginWindowRect) {