From 4308bca279080911dbddb2cde4886bdea6be653b Mon Sep 17 00:00:00 2001
From: Simon Pieters <zcorpan@gmail.com>
Date: Thu, 21 Jun 2018 14:49:22 +0200
Subject: [PATCH] HTML: Expect salvegable to be set to false for pagehide test

Also rename the manual test.

Part of #11269.
---
 .../browsing-the-web/unloading-documents/unload/006-1.html   | 5 ++++-
 .../unload/{manual-001-1.html => pagehide-manual-1.html}     | 0
 .../unload/{manual-001.html => pagehide-manual.html}         | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)
 rename html/browsers/browsing-the-web/unloading-documents/unload/{manual-001-1.html => pagehide-manual-1.html} (100%)
 rename html/browsers/browsing-the-web/unloading-documents/unload/{manual-001.html => pagehide-manual.html} (85%)

diff --git a/html/browsers/browsing-the-web/unloading-documents/unload/006-1.html b/html/browsers/browsing-the-web/unloading-documents/unload/006-1.html
index 8d265962375da6c..bc2e10bdc3514f5 100644
--- a/html/browsers/browsing-the-web/unloading-documents/unload/006-1.html
+++ b/html/browsers/browsing-the-web/unloading-documents/unload/006-1.html
@@ -4,9 +4,12 @@
 onpagehide = function() {
   onpagehide = null;
   setTimeout(function() {
-               parent.t.done()
+               parent.t.unreached_func('setTimeout survived navigatoin');
              }, 1000);
 }
+if (parent.loaded) {
+  setTimeout(function() { parent.t.done(); }, 2000);
+}
 onload = function() {
   if (!parent.loaded) {
     parent.loaded = true;
diff --git a/html/browsers/browsing-the-web/unloading-documents/unload/manual-001-1.html b/html/browsers/browsing-the-web/unloading-documents/unload/pagehide-manual-1.html
similarity index 100%
rename from html/browsers/browsing-the-web/unloading-documents/unload/manual-001-1.html
rename to html/browsers/browsing-the-web/unloading-documents/unload/pagehide-manual-1.html
diff --git a/html/browsers/browsing-the-web/unloading-documents/unload/manual-001.html b/html/browsers/browsing-the-web/unloading-documents/unload/pagehide-manual.html
similarity index 85%
rename from html/browsers/browsing-the-web/unloading-documents/unload/manual-001.html
rename to html/browsers/browsing-the-web/unloading-documents/unload/pagehide-manual.html
index 6d817a111cd2011..ba34c3087f3bf6d 100644
--- a/html/browsers/browsing-the-web/unloading-documents/unload/manual-001.html
+++ b/html/browsers/browsing-the-web/unloading-documents/unload/pagehide-manual.html
@@ -2,4 +2,4 @@
 <title>Document salvagable state after setting pagehide handler</title>
 <script>onpagehide = function() {setTimeout(function(){document.body.innerHTML = "PASS"}, 100)}</script>
 <p>Click the link below then navigate back to this page. Shortly after returning you should see the text "PASS"</p>
-<p><A href="manual-001-1.html">Click here</a>
+<p><a href="pagehide-manual-1.html">Click here</a>