[tbb-commits] [tor-browser/esr24] Bug 873661 - Wait both browserloadend and process-created event. r=fabrice, a=test-only

[mikeperry at torproject.org]

commit 65ae9093262518864695bc8936cab4a77342f7ff
Author: Kan-Ru Chen (陳侃如) <kanru at kanru.info>
Date:   Wed Feb 19 10:55:25 2014 +0800

    Bug 873661 - Wait both browserloadend and process-created event. r=fabrice, a=test-only
---
 .../mochitest/priority/test_NestedFrames.html            |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/dom/browser-element/mochitest/priority/test_NestedFrames.html b/dom/browser-element/mochitest/priority/test_NestedFrames.html
index 21184a4..7d9899b 100644
--- a/dom/browser-element/mochitest/priority/test_NestedFrames.html
+++ b/dom/browser-element/mochitest/priority/test_NestedFrames.html
@@ -49,13 +49,13 @@ function runTest() {
   // Note that this is the process corresponding to the /inner/ iframe.  The
   // outer iframe runs in-process (because it has remote=false).
   var childID = null;
-  expectOnlyOneProcessCreated().then(function(chid) {
-    childID = chid;
-    return Promise.all(
-      [expectPriorityChange(childID, 'FOREGROUND'),
-       expectMozbrowserEvent(iframe, 'loadend')]
-    );
-  }).then(function() {
+  Promise.all(
+    [expectOnlyOneProcessCreated().then(function(child) {
+       childID = child;
+       return expectPriorityChange(childID, 'FOREGROUND');
+     }),
+     expectMozbrowserEvent(iframe, 'loadend')]
+  ).then(function() {
     // Send the outer iframe into the background.  This should change the
     // priority of the inner frame's process to BACKGROUND.
     var p = expectPriorityChange(childID, 'BACKGROUND');