Adding upstream version 126.0.upstream/126.0

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

4 files changed, 7 insertions, 7 deletions

diff --git a/toolkit/components/cleardata/tests/browser/browser.toml b/toolkit/components/cleardata/tests/browser/browser.toml
index 16ecffce02..d13f4f4f32 100644
--- a/toolkit/components/cleardata/tests/browser/browser.toml
+++ b/toolkit/components/cleardata/tests/browser/browser.toml
@@ -3,21 +3,18 @@
 ["browser_auth_tokens.js"]
 
 ["browser_css_cache.js"]
-https_first_disabled = true
 support-files = [
   "file_css_cache.css",
   "file_css_cache.html"
 ]
 
 ["browser_image_cache.js"]
-https_first_disabled = true
 support-files = [
   "file_image_cache.html",
   "file_image_cache.jpg"
 ]
 
 ["browser_preflight_cache.js"]
-https_first_disabled = true
 support-files = ["file_cors_preflight.sjs"]
 
 ["browser_quota.js"]
diff --git a/toolkit/components/cleardata/tests/browser/browser_css_cache.js b/toolkit/components/cleardata/tests/browser/browser_css_cache.js
index 47088e5011..61cee8b8d9 100644
--- a/toolkit/components/cleardata/tests/browser/browser_css_cache.js
+++ b/toolkit/components/cleardata/tests/browser/browser_css_cache.js
@@ -74,6 +74,7 @@ async function cleanupTestTabs() {
 }
 
 add_task(async function test_deleteByPrincipal() {
+  await SpecialPowers.setBoolPref("dom.security.https_first", false);
   await addTestTabs();
 
   // Clear data for content principal of A
diff --git a/toolkit/components/cleardata/tests/browser/browser_image_cache.js b/toolkit/components/cleardata/tests/browser/browser_image_cache.js
index d7116d2502..947d4aba3e 100644
--- a/toolkit/components/cleardata/tests/browser/browser_image_cache.js
+++ b/toolkit/components/cleardata/tests/browser/browser_image_cache.js
@@ -114,6 +114,7 @@ add_setup(function () {
 });
 
 add_task(async function test_deleteByPrincipal() {
+  await SpecialPowers.setBoolPref("dom.security.https_first", false);
   await addTestTabs();
 
   // Clear data for content principal of A
@@ -152,6 +153,7 @@ add_task(async function test_deleteByPrincipal() {
 });
 
 add_task(async function test_deleteByBaseDomain() {
+  await SpecialPowers.setBoolPref("dom.security.https_first", false);
   await addTestTabs();
 
   // Clear data for base domain of A.
diff --git a/toolkit/components/cleardata/tests/browser/browser_preflight_cache.js b/toolkit/components/cleardata/tests/browser/browser_preflight_cache.js
index d3eabb9e38..8973cc981c 100644
--- a/toolkit/components/cleardata/tests/browser/browser_preflight_cache.js
+++ b/toolkit/components/cleardata/tests/browser/browser_preflight_cache.js
@@ -9,8 +9,8 @@ const { SiteDataTestUtils } = ChromeUtils.importESModule(
 
 const uuidGenerator = Services.uuid;
 
-const ORIGIN_A = "http://example.net";
-const ORIGIN_B = "http://example.org";
+const ORIGIN_A = "https://example.net";
+const ORIGIN_B = "https://example.org";
 
 const PREFLIGHT_URL_PATH =
   "/browser/toolkit/components/cleardata/tests/browser/file_cors_preflight.sjs";
@@ -45,7 +45,7 @@ async function testDeleteAll(
   clearDataFlag,
   { deleteBy = "all", hasUserInput = false } = {}
 ) {
-  await BrowserTestUtils.withNewTab("http://example.com", async browser => {
+  await BrowserTestUtils.withNewTab("https://example.com", async browser => {
     let token = uuidGenerator.generateUUID().toString();
 
     // Populate the preflight cache.
@@ -132,7 +132,7 @@ add_task(async function test_deletePrivateBrowsingCache() {
 
     const tab = (browser.gBrowser.selectedTab = BrowserTestUtils.addTab(
       browser.gBrowser,
-      "http://example.com"
+      "https://example.com"
     ));
     await BrowserTestUtils.browserLoaded(tab.linkedBrowser);