mozilla-central: changeset 243550:7a5258332448e586e3ca42dfc2b8f4ff772acbb6

author	Eddy Bruël <ejpbruel@gmail.com>
	Fri, 08 May 2015 07:08:17 +0200
changeset 243550	7a5258332448e586e3ca42dfc2b8f4ff772acbb6
parent 243549	b46612a5525552a32c511d9b223e1e8291262a13
child 243551	77c19e3e5a440a3ba36140f91be123cf87c7b821
push id	28741
push user	kwierso@gmail.com
push date	Tue, 12 May 2015 23:24:40 +0000
treeherder	mozilla-central@d476776d920d [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	khuey
bugs	1150444
milestone	41.0a1
first release with	nightly linux32 62d9b117c688 / 41.0a1 / 20150513030209 / files nightly linux64 62d9b117c688 / 41.0a1 / 20150513030209 / files nightly mac 62d9b117c688 / 41.0a1 / 20150513030209 / files nightly win32 62d9b117c688 / 41.0a1 / 20150513030209 / files nightly win64 62d9b117c688 / 41.0a1 / 20150513030209 / files
last release without	nightly linux32 8b64c75b0b86 / 41.0a1 / 20150512030215 / files nightly linux64 8b64c75b0b86 / 41.0a1 / 20150512030215 / files nightly mac 8b64c75b0b86 / 41.0a1 / 20150512030215 / files nightly win32 8b64c75b0b86 / 41.0a1 / 20150512030215 / files nightly win64 8b64c75b0b86 / 41.0a1 / 20150512030215 / files

--- a/dom/workers/test/test_WorkerDebugger.isFrozen.xul
+++ b/dom/workers/test/test_WorkerDebugger.isFrozen.xul
@@ -58,17 +58,17 @@
            "debugger for worker on page 1 should not be closed");
         is(dbg1.isFrozen, true,
            "debugger for worker on page 1 should be frozen");
         is(dbg2.isClosed, false,
            "debugger for worker on page 2 should not be closed");
         is(dbg2.isFrozen, false,
            "debugger for worker on page 2 should not be frozen");
 
-        promise = waitForMultiple([
+        promise = Promise.all([
           waitForDebuggerFreeze(dbg2),
           waitForDebuggerThaw(dbg1),
         ]);
         iframe.contentWindow.history.back();
         yield promise;
         is(dbg1.isClosed, false,
            "debugger for worker on page 1 should not be closed")
         is(dbg1.isFrozen, false,