Attempted fix for bug 542928, timeouts after test_bug511456.js

toolkit/components/startup/tests/browser/browser_bug511456.js

@@ -104,13 +104,15 @@ function test() {
         return;
       gBrowser.removeEventListener("load", arguments.callee, false);
       Watcher.seen = false;
-      goQuitApplication();
+      var appStartup = Cc['@mozilla.org/toolkit/app-startup;1'].
+                       getService(Ci.nsIAppStartup);
+      appStartup.quit(Ci.nsIAppStartup.eAttemptQuit);
       Watcher.allowClose = true;
       ok(Watcher.seen, "Should have seen a prompt dialog");
       ok(!win2.closed, "Shouldn't have closed the additional window");
       win2.close();
       gBrowser.removeTab(gBrowser.selectedTab);
-      finish_test();
+      executeSoon(finish_test);
     }, false);
   }, false);
 }

toolkit/components/startup/tests/browser/browser_bug537449.js

@@ -101,7 +101,9 @@ function test() {
       return;
     gBrowser.removeEventListener("load", arguments.callee, false);
     Watcher.seen = false;
-    goQuitApplication();
+    var appStartup = Cc['@mozilla.org/toolkit/app-startup;1'].
+                     getService(Ci.nsIAppStartup);
+    appStartup.quit(Ci.nsIAppStartup.eAttemptQuit);
     Watcher.allowClose = true;
     ok(Watcher.seen, "Should have seen a prompt dialog");
     ok(!window.closed, "Shouldn't have closed the window");
@@ -111,7 +113,7 @@ function test() {
       win2.removeEventListener("load", arguments.callee, false);
       win2.close();
       gBrowser.removeTab(gBrowser.selectedTab);
-      finish_test();
+      executeSoon(finish_test);
     }, false);
   }, false);
 }