From e8179c9b869ed7da77b004acc325fc9074165808 Mon Sep 17 00:00:00 2001
From: Domenic Denicola <d@domenic.me>
Date: Thu, 3 Nov 2016 18:30:27 -0400
Subject: [PATCH] Fix per bzbarsky's review

In https://github.com/whatwg/html/pull/1995#issuecomment-257478435
---
 workers/Worker_ErrorEvent_after_navigation.htm           | 2 +-
 workers/Worker_ErrorEvent_after_navigation_support-1.htm | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/workers/Worker_ErrorEvent_after_navigation.htm b/workers/Worker_ErrorEvent_after_navigation.htm
index cf5974ac95a334..4f2e30e30355d7 100644
--- a/workers/Worker_ErrorEvent_after_navigation.htm
+++ b/workers/Worker_ErrorEvent_after_navigation.htm
@@ -21,10 +21,10 @@
   const windowProxy = iframe.contentWindow;
 
   window.addEventListener("load", t.step_func(() => {
+    windowProxy.onerror = t.unreached_func("The navigated-away-from Window error event must never fire");
     windowProxy.doWorkerStuffAndExpectNoError(t);
 
     iframe.addEventListener("load", t.step_func(() => {
-      windowProxy.onerror = t.unreached_func("The navigated-away-from Window error event must never fire");
 
       // The test passes if no error events have been fired within this time.
       setTimeout(t.step_func_done(), 300);
diff --git a/workers/Worker_ErrorEvent_after_navigation_support-1.htm b/workers/Worker_ErrorEvent_after_navigation_support-1.htm
index ccfbf6502d5bd5..eeed456a2e4f2f 100644
--- a/workers/Worker_ErrorEvent_after_navigation_support-1.htm
+++ b/workers/Worker_ErrorEvent_after_navigation_support-1.htm
@@ -15,10 +15,7 @@
 window.doWorkerStuffAndExpectError = t => {
   const worker = new Worker("./support/error-after-some-time.js");
   worker.onerror = t.step_func_done(ev => {
-    // Cannot use assert_equals since including testharness.js makes it believe this is a test file.
-    if (ev.constructor !== ErrorEvent) {
-      throw new Error("The worker error event must fire");
-    }
+    parent.assert_equals(ev.constructor, ErrorEvent, "The worker error event must fire");
   });
 
   worker.postMessage("error expected");