summaryrefslogtreecommitdiffstats
path: root/chrome/test/ui
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-23 19:22:00 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-23 19:22:00 +0000
commit90aca24d74f13b7fb864caafb92e088a91b15903 (patch)
tree05bc6c5edeecefa91d06a6404f3925644e633b57 /chrome/test/ui
parentd3ef5942dc19d90fe64e721c0733573d4a89caa5 (diff)
downloadchromium_src-90aca24d74f13b7fb864caafb92e088a91b15903.zip
chromium_src-90aca24d74f13b7fb864caafb92e088a91b15903.tar.gz
chromium_src-90aca24d74f13b7fb864caafb92e088a91b15903.tar.bz2
Add a regression test for the renderer hang when a plugin's NP_Initialize function crashes.
BUG=25104 Review URL: http://codereview.chromium.org/337004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29923 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ui')
-rw-r--r--chrome/test/ui/npapi_uitest.cc25
1 files changed, 25 insertions, 0 deletions
diff --git a/chrome/test/ui/npapi_uitest.cc b/chrome/test/ui/npapi_uitest.cc
index 39e0571..34ba3fd 100644
--- a/chrome/test/ui/npapi_uitest.cc
+++ b/chrome/test/ui/npapi_uitest.cc
@@ -338,3 +338,28 @@ TEST_F(NPAPITester, EnsureScriptingWorksInDestroy) {
kTestCompleteCookie, kTestCompleteSuccess,
kShortWaitTimeout);
}
+
+// This test uses a Windows Event to signal to the plugin that it should crash
+// on NP_Initialize.
+#if defined(OS_WIN)
+
+TEST_F(NPAPITester, NoHangIfInitCrashes) {
+ if (UITest::in_process_renderer())
+ return;
+
+ // Only Windows implements the crash service for now.
+#if defined(OS_WIN)
+ expected_crashes_ = 1;
+#endif
+
+ HANDLE crash_event = CreateEvent(NULL, TRUE, FALSE, L"TestPluginCrashOnInit");
+ SetEvent(crash_event);
+ GURL url = GetTestUrl(L"npapi", L"no_hang_if_init_crashes.html");
+ NavigateToURL(url);
+ WaitForFinish("no_hang_if_init_crashes", "1", url,
+ kTestCompleteCookie, kTestCompleteSuccess,
+ kShortWaitTimeout);
+ CloseHandle(crash_event);
+}
+
+#endif