Merging upstream version 126.0.

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

9 files changed, 14 insertions, 15 deletions

diff --git a/dom/base/test/fullscreen/browser_fullscreen-bug-1798219.js b/dom/base/test/fullscreen/browser_fullscreen-bug-1798219.js
index 2aef23b042..6764ff2009 100644
--- a/dom/base/test/fullscreen/browser_fullscreen-bug-1798219.js
+++ b/dom/base/test/fullscreen/browser_fullscreen-bug-1798219.js
@@ -52,7 +52,7 @@ async function waitAndCheckFullscreenState(aWindow) {
 
 add_task(async () => {
   const URL =
-    "http://mochi.test:8888/browser/dom/base/test/fullscreen/file_fullscreen-bug-1798219.html";
+    "https://example.com/browser/dom/base/test/fullscreen/file_fullscreen-bug-1798219.html";
   // We need this dummy tab which load the same URL as test tab to keep the
   // original content process alive after test page navigates away.
   let dummyTab = await BrowserTestUtils.openNewForegroundTab(gBrowser, URL);
@@ -90,7 +90,7 @@ add_task(async () => {
   await BrowserTestUtils.withNewTab(
     {
       gBrowser,
-      url: "http://mochi.test:8888/browser/dom/base/test/fullscreen/file_fullscreen-bug-1798219-2.html",
+      url: "https://example.com/browser/dom/base/test/fullscreen/file_fullscreen-bug-1798219-2.html",
     },
     async function (browser) {
       // Open a new window to run the tests, the original window will keep the
diff --git a/dom/base/test/fullscreen/browser_fullscreen-navigation-history-race.js b/dom/base/test/fullscreen/browser_fullscreen-navigation-history-race.js
index 49a48c3177..ab1651fd74 100644
--- a/dom/base/test/fullscreen/browser_fullscreen-navigation-history-race.js
+++ b/dom/base/test/fullscreen/browser_fullscreen-navigation-history-race.js
@@ -54,7 +54,7 @@ function preventBFCache(aBrowsingContext, aPrevent) {
         await BrowserTestUtils.withNewTab(
           {
             gBrowser,
-            url: "http://mochi.test:8888/browser/dom/base/test/fullscreen/dummy_page.html",
+            url: "https://example.com/browser/dom/base/test/fullscreen/dummy_page.html",
           },
           async function (browser) {
             // Maybe prevent BFCache on initial page.
@@ -66,7 +66,7 @@ function preventBFCache(aBrowsingContext, aPrevent) {
             // Navigate to fullscreen page.
             const url = crossOrigin
               ? "https://example.org/browser/dom/base/test/fullscreen/file_fullscreen-iframe-inner.html"
-              : "http://mochi.test:8888/browser/dom/base/test/fullscreen/file_fullscreen-iframe-inner.html";
+              : "https://example.com/browser/dom/base/test/fullscreen/file_fullscreen-iframe-inner.html";
             const loaded = BrowserTestUtils.browserLoaded(browser, false, url);
             BrowserTestUtils.startLoadingURIString(browser, url);
             await loaded;
diff --git a/dom/base/test/fullscreen/browser_fullscreen-navigation-history.js b/dom/base/test/fullscreen/browser_fullscreen-navigation-history.js
index c4feb7f641..1b344b7a2f 100644
--- a/dom/base/test/fullscreen/browser_fullscreen-navigation-history.js
+++ b/dom/base/test/fullscreen/browser_fullscreen-navigation-history.js
@@ -54,7 +54,7 @@ function preventBFCache(aBrowsingContext, aPrevent) {
         await BrowserTestUtils.withNewTab(
           {
             gBrowser,
-            url: "http://mochi.test:8888/browser/dom/base/test/fullscreen/dummy_page.html",
+            url: "https://example.com/browser/dom/base/test/fullscreen/dummy_page.html",
           },
           async function (browser) {
             // Maybe prevent BFCache on initial page.
@@ -66,7 +66,7 @@ function preventBFCache(aBrowsingContext, aPrevent) {
             // Navigate to fullscreen page.
             const url = crossOrigin
               ? "https://example.org/browser/dom/base/test/fullscreen/file_fullscreen-iframe-inner.html"
-              : "http://mochi.test:8888/browser/dom/base/test/fullscreen/file_fullscreen-iframe-inner.html";
+              : "https://example.com/browser/dom/base/test/fullscreen/file_fullscreen-iframe-inner.html";
             const loaded = BrowserTestUtils.browserLoaded(browser, false, url);
             BrowserTestUtils.startLoadingURIString(browser, url);
             await loaded;
diff --git a/dom/base/test/fullscreen/browser_fullscreen-window-open-race.js b/dom/base/test/fullscreen/browser_fullscreen-window-open-race.js
index 4cf8a3d8c7..95668db542 100644
--- a/dom/base/test/fullscreen/browser_fullscreen-window-open-race.js
+++ b/dom/base/test/fullscreen/browser_fullscreen-window-open-race.js
@@ -27,7 +27,7 @@ add_setup(async function () {
 
 add_task(async () => {
   const url =
-    "http://mochi.test:8888/browser/dom/base/test/fullscreen/dummy_page.html";
+    "https://example.com/browser/dom/base/test/fullscreen/dummy_page.html";
   const name = "foo";
 
   await BrowserTestUtils.withNewTab(
diff --git a/dom/base/test/fullscreen/file_MozDomFullscreen.html b/dom/base/test/fullscreen/file_MozDomFullscreen.html
index f954892706..600d335501 100644
--- a/dom/base/test/fullscreen/file_MozDomFullscreen.html
+++ b/dom/base/test/fullscreen/file_MozDomFullscreen.html
@@ -3,6 +3,6 @@
 </head>
 <body style="background-color: blue;">
 <p>Outer doc</p>
-<iframe id="innerFrame" src="http://mochi.test:8888/"></iframe>
+<iframe id="innerFrame" src="https://example.com/"></iframe>
 </body>
 </html>
diff --git a/dom/base/test/fullscreen/file_fullscreen-iframe-middle.html b/dom/base/test/fullscreen/file_fullscreen-iframe-middle.html
index b60dea43bf..35b07cfa11 100644
--- a/dom/base/test/fullscreen/file_fullscreen-iframe-middle.html
+++ b/dom/base/test/fullscreen/file_fullscreen-iframe-middle.html
@@ -1,5 +1,5 @@
 <div name="div" id="div" style="width: 100px; height: 100px; background: blue;">
 <iframe id="iframe" allowfullscreen="yes"
-        src="http://example.org/browser/dom/base/test/fullscreen/file_fullscreen-iframe-inner.html">
+        src="https://example.org/browser/dom/base/test/fullscreen/file_fullscreen-iframe-inner.html">
 </iframe>
 </div><br>
diff --git a/dom/base/test/fullscreen/file_fullscreen-iframe-top.html b/dom/base/test/fullscreen/file_fullscreen-iframe-top.html
index dddf4930c2..b61cdc02c3 100644
--- a/dom/base/test/fullscreen/file_fullscreen-iframe-top.html
+++ b/dom/base/test/fullscreen/file_fullscreen-iframe-top.html
@@ -1,5 +1,5 @@
 <div name="div" id="div" style="width: 100px; height: 100px; background: red;">
 <iframe id="iframe" allowfullscreen="yes"
-        src="http://mochi.test:8888/browser/dom/base/test/fullscreen/file_fullscreen-iframe-middle.html">
+        src="https://example.com/browser/dom/base/test/fullscreen/file_fullscreen-iframe-middle.html">
 </iframe>
 </div><br>
diff --git a/dom/base/test/fullscreen/fullscreen_helpers.js b/dom/base/test/fullscreen/fullscreen_helpers.js
index f097ae316e..41548cf8aa 100644
--- a/dom/base/test/fullscreen/fullscreen_helpers.js
+++ b/dom/base/test/fullscreen/fullscreen_helpers.js
@@ -8,15 +8,14 @@ const TEST_URLS = [
   `data:text/html,
     <div name="div" id="div" style="width: 100px; height: 100px; background: red;">
     <iframe id="iframe" allowfullscreen="yes"
-     src="http://mochi.test:8888/browser/dom/base/test/fullscreen/file_fullscreen-iframe-middle.html"></iframe>
+     src="https://example.com/browser/dom/base/test/fullscreen/file_fullscreen-iframe-middle.html"></iframe>
     </div>`,
   // toplevel and inner most iframe are in same process, and middle iframe is
   // in a different process.
-  // eslint-disable-next-line @microsoft/sdl/no-insecure-url
-  `http://example.org/browser/dom/base/test/fullscreen/file_fullscreen-iframe-top.html`,
+  `https://example.org/browser/dom/base/test/fullscreen/file_fullscreen-iframe-top.html`,
   // toplevel and middle iframe are in same process, and inner most iframe is
   // in a different process.
-  `http://mochi.test:8888/browser/dom/base/test/fullscreen/file_fullscreen-iframe-top.html`,
+  `https://example.com/browser/dom/base/test/fullscreen/file_fullscreen-iframe-top.html`,
 ];
 
 function waitRemoteFullscreenExitEvents(aBrowsingContexts) {
diff --git a/dom/base/test/fullscreen/test_MozDomFullscreen_event.xhtml b/dom/base/test/fullscreen/test_MozDomFullscreen_event.xhtml
index 3041d851ac..6b3d8fada2 100644
--- a/dom/base/test/fullscreen/test_MozDomFullscreen_event.xhtml
+++ b/dom/base/test/fullscreen/test_MozDomFullscreen_event.xhtml
@@ -17,7 +17,7 @@ var gPrevTrusted = SpecialPowers.getBoolPref("full-screen-api.allow-trusted-requ
 var newwindow;
 
 // Ensure "fullscreen" permissions are not present on the test URI.
-var uri = Services.io.newURI("http://mochi.test:8888");
+var uri = Services.io.newURI("https://example.com");
 var principal = Services.scriptSecurityManager.createContentPrincipal(uri, {});
 Services.perms.removeFromPrincipal(principal, "fullscreen");