From 82dff3dafbca399a71048dd19bd05b71b8d5dbfc Mon Sep 17 00:00:00 2001
From: Andreas Farre <farre@mozilla.com>
Date: Fri, 9 Dec 2016 04:46:31 +0100
Subject: [PATCH] Revert rev 9211bfa02ed5 (Bug 1315260). Wrong commit message.
 r=me

MozReview-Commit-ID: 7uFDhNpx4XP
---
 .../meta/XMLHttpRequest/open-url-multi-window-6.htm.ini      | 5 -----
 .../tests/XMLHttpRequest/open-url-multi-window-6.htm         | 4 ++--
 2 files changed, 2 insertions(+), 7 deletions(-)
 delete mode 100644 testing/web-platform/meta/XMLHttpRequest/open-url-multi-window-6.htm.ini

diff --git a/testing/web-platform/meta/XMLHttpRequest/open-url-multi-window-6.htm.ini b/testing/web-platform/meta/XMLHttpRequest/open-url-multi-window-6.htm.ini
deleted file mode 100644
index 781777145541..000000000000
--- a/testing/web-platform/meta/XMLHttpRequest/open-url-multi-window-6.htm.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[open-url-multi-window-6.htm]
-  type: testharness
-  [XMLHttpRequest: open() in document that is not fully active (but may be active) should throw]
-    expected: FAIL
-
diff --git a/testing/web-platform/tests/XMLHttpRequest/open-url-multi-window-6.htm b/testing/web-platform/tests/XMLHttpRequest/open-url-multi-window-6.htm
index e4f0aee60ecf..b6f15828afee 100644
--- a/testing/web-platform/tests/XMLHttpRequest/open-url-multi-window-6.htm
+++ b/testing/web-platform/tests/XMLHttpRequest/open-url-multi-window-6.htm
@@ -26,8 +26,8 @@
                 client = new ifr.contentWindow.XMLHttpRequest();
                 count++;
                 // Important to do a normal navigation, not a reload.
-                win.location.href = "resources/init.htm?avoid-replace";
-              }, 0);
+                win.location.href = "resources/init.htm";
+              }, 100);
             }
             doc.body.appendChild(ifr);
           } else if(1 == count) {