summaryrefslogtreecommitdiffstats
path: root/chrome/test/data
diff options
context:
space:
mode:
authorsreeram@chromium.org <sreeram@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-19 03:02:22 +0000
committersreeram@chromium.org <sreeram@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-19 03:02:22 +0000
commit9ed435aa2d89da4dc1b0abfe622eab17780dc7ec (patch)
tree8574d6eb17127e2d06b8e205f9232516505aecb2 /chrome/test/data
parentfb0c3927221612b0d43e88c22c47491a5ea5a8cc (diff)
downloadchromium_src-9ed435aa2d89da4dc1b0abfe622eab17780dc7ec.zip
chromium_src-9ed435aa2d89da4dc1b0abfe622eab17780dc7ec.tar.gz
chromium_src-9ed435aa2d89da4dc1b0abfe622eab17780dc7ec.tar.bz2
Make FastShutdown.SlowTermination non-interactive.
This avoids SimulateOSClick() flakiness. I've verified that the test continues to catch regressions in the original bug (cf: http://crrev.com/27831). BUG=89173 TEST=FastShutdown.SlowTermination Review URL: http://codereview.chromium.org/7671012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97415 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/data')
-rw-r--r--chrome/test/data/fast_shutdown/on_before_unloader.html4
-rw-r--r--chrome/test/data/fast_shutdown/on_unloader.html14
2 files changed, 5 insertions, 13 deletions
diff --git a/chrome/test/data/fast_shutdown/on_before_unloader.html b/chrome/test/data/fast_shutdown/on_before_unloader.html
index fe6580d..d6576fd 100644
--- a/chrome/test/data/fast_shutdown/on_before_unloader.html
+++ b/chrome/test/data/fast_shutdown/on_before_unloader.html
@@ -1 +1,3 @@
-<BODY onBeforeUnload="var x = 5">
+<script>
+addEventListener("beforeunload", function() {}, false);
+</script>
diff --git a/chrome/test/data/fast_shutdown/on_unloader.html b/chrome/test/data/fast_shutdown/on_unloader.html
index b60a428..d4b67a3 100644
--- a/chrome/test/data/fast_shutdown/on_unloader.html
+++ b/chrome/test/data/fast_shutdown/on_unloader.html
@@ -1,17 +1,7 @@
<script>
-function setCookie() {
+addEventListener("unload", function() {
var expires = new Date();
expires.setMinutes(expires.getMinutes() + 1);
document.cookie = "unloaded=ohyeah;path=/;expires=" + expires.toUTCString();
-}
-</script>
-
-<BODY onUnload="setCookie()" onClick="doPopup()">
-
-<script>
-
-function doPopup() {
- popup = window.open('on_before_unloader.html')
-}
-
+}, false);
</script>