Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 6 insertions, 6 deletions

diff --git a/toolkit/components/startup/public/nsIAppStartup.idl b/toolkit/components/startup/public/nsIAppStartup.idl
index dec948b503..e8b407faeb 100644
--- a/toolkit/components/startup/public/nsIAppStartup.idl
+++ b/toolkit/components/startup/public/nsIAppStartup.idl
@@ -81,7 +81,7 @@ interface nsIAppStartup : nsISupports
      * was called (and therefore the application crashed).
      * @return whether safe mode is necessary
      */
-    bool trackStartupCrashBegin();
+    boolean trackStartupCrashBegin();
 
     /**
      * We have succesfully started without crashing. Clear flags that were
@@ -149,7 +149,7 @@ interface nsIAppStartup : nsISupports
      *         of a hidden window or if the user disallowed a window
      *         to be closed.
      */
-    bool quit(in uint32_t aMode, [optional] in int32_t aExitCode);
+    boolean quit(in uint32_t aMode, [optional] in int32_t aExitCode);
 
     /**
     * These values must match the xpcom/base/ShutdownPhase.h values.
@@ -190,7 +190,7 @@ interface nsIAppStartup : nsISupports
      *
      * @return true if we are in or beyond the given phase.
      */
-    bool isInOrBeyondShutdownPhase(in nsIAppStartup_IDLShutdownPhase aPhase);
+    boolean isInOrBeyondShutdownPhase(in nsIAppStartup_IDLShutdownPhase aPhase);
 
     /**
      * True if the application is in the process of shutting down.
@@ -240,7 +240,7 @@ interface nsIAppStartup : nsISupports
     /**
      * Whether or not we showed the startup skeleton UI.
      */
-    readonly attribute bool showedPreXULSkeletonUI;
+    readonly attribute boolean showedPreXULSkeletonUI;
 
     /**
      * Returns an object with main, process, firstPaint, sessionRestored properties.
diff --git a/toolkit/components/startup/tests/browser/browser_bug511456.js b/toolkit/components/startup/tests/browser/browser_bug511456.js
index c080a1596f..04152a6103 100644
--- a/toolkit/components/startup/tests/browser/browser_bug511456.js
+++ b/toolkit/components/startup/tests/browser/browser_bug511456.js
@@ -45,7 +45,7 @@ function test() {
         win2.close();
 
         // Leave the page the second time.
-        waitForOnBeforeUnloadDialog(browser, (btnLeave, btnStay) => {
+        waitForOnBeforeUnloadDialog(browser, btnLeave => {
           btnLeave.click();
         });
 
diff --git a/toolkit/components/startup/tests/browser/browser_bug537449.js b/toolkit/components/startup/tests/browser/browser_bug537449.js
index 1b54117a7d..10e54ea6d2 100644
--- a/toolkit/components/startup/tests/browser/browser_bug537449.js
+++ b/toolkit/components/startup/tests/browser/browser_bug537449.js
@@ -44,7 +44,7 @@ function test() {
           win2.close();
 
           // Leave the page the second time.
-          waitForOnBeforeUnloadDialog(browser, (btnLeave, btnStay) => {
+          waitForOnBeforeUnloadDialog(browser, btnLeave => {
             btnLeave.click();
           });