Attempt to fix orange in bug 772823

--HG--
extra : transplant_source : %C82%CF%EC%AD%E8%D1%87%19%22%10k%9E%F3%EA%CF%FB%F9%8FC

docshell/test/chrome/mozFrameType_window.xul

@@ -32,22 +32,22 @@
       SimpleTest.is(getDocShellType(typeContentFrame), Ci.nsIDocShellTreeItem.typeContent,
                     "iframe with mozFrameType='content' in chrome document is typeContent");
 
-      // Wait for the window to be closed before finishing the test
-      let ww = Components.classes["@mozilla.org/embedcomp/window-watcher;1"]
-                   .getService(Components.interfaces.nsIWindowWatcher);
-      ww.registerNotification(function windowObs(subject, topic, data) {
-        if (topic == "domwindowclosed") {
-          ww.unregisterNotification(windowObs);
+      SimpleTest.executeSoon(function () {
+        // Wait for the window to be closed before finishing the test
+        let ww = Components.classes["@mozilla.org/embedcomp/window-watcher;1"]
+                     .getService(Components.interfaces.nsIWindowWatcher);
+        ww.registerNotification(function windowObs(subject, topic, data) {
+          if (topic == "domwindowclosed") {
+            ww.unregisterNotification(windowObs);
 
-          SimpleTest.executeSoon(function () {
             SimpleTest.waitForFocus(function() {
               SimpleTest.finish();
             }, opener);
-          });
-        }
-      });
+          }
+        });
 
-      window.close();
+        window.close();
+      });
     }
   ]]></script>
 </window>

docshell/test/chrome/test_mozFrameType.xul

@@ -30,8 +30,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=769771
 /** Test for Bug 769771 **/
 SimpleTest.waitForExplicitFinish();
 
-window.open("mozFrameType_window.xul", "mozFrameType",
-            "chrome,width=600,height=600");
+addLoadEvent(function () {
+  window.open("mozFrameType_window.xul", "mozFrameType",
+              "chrome,width=600,height=600");
+});
 
 ]]>
 </script>