Backed out 2 changesets (bug 1835983, bug 1719271) for causing mochitests failures. CLOSED TREE

Backed out changeset 23d719860ea7 (bug 1719271)
Backed out changeset 10010b949e52 (bug 1835983)

browser/base/content/test/contextMenu/browser.toml

@@ -58,7 +58,6 @@ skip-if = ["os == 'linux' && socketprocess_networking"]
 skip-if = ["os == 'linux' && socketprocess_networking"]
 
 ["browser_contextmenu_share_macosx.js"]
-https_first_disabled = true
 support-files = ["browser_contextmenu_shareurl.html"]
 run-if = ["os == 'mac'"]
 

browser/components/extensions/test/browser/browser_ext_tabs_create.js

@@ -21,9 +21,6 @@ add_task(async function test_create_options() {
     ],
   });
 
-  // Ensure previous HTTPS-First exceptions don't change test expectations
-  Services.perms.removeByType("https-only-load-insecure");
-
   let extension = ExtensionTestUtils.loadExtension({
     manifest: {
       permissions: ["tabs"],

browser/components/urlbar/tests/browser/browser_autocomplete_enter_race.js

@@ -8,9 +8,11 @@
  */
 
 // The order of these tests matters!
-
+const IS_UPGRADING_SCHEMELESS = SpecialPowers.getBoolPref(
+  "dom.security.https_first_schemeless"
+);
 // eslint-disable-next-line @microsoft/sdl/no-insecure-url
-const DEFAULT_URL_SCHEME = "http://";
+const DEFAULT_URL_SCHEME = IS_UPGRADING_SCHEMELESS ? "https://" : "http://";
 
 add_setup(async function () {
   let bm = await PlacesUtils.bookmarks.insert({
@@ -22,12 +24,6 @@ add_setup(async function () {
     await PlacesUtils.bookmarks.remove(bm);
     await PlacesUtils.history.clear();
   });
-  await SpecialPowers.pushPrefEnv({
-    set: [
-      ["dom.security.https_first", false],
-      ["dom.security.https_first_schemeless", false],
-    ],
-  });
   // Needs at least one success.
   ok(true, "Setup complete");
 });

dom/base/test/unit/xpcshell.toml

@@ -26,7 +26,6 @@ support-files = [
 ]
 
 ["test_blockParsing.js"]
-prefs = ["dom.security.https_first=false"]
 skip-if = [
   "debug", # We fail an assertion if we block parsing on a self-closing element
   "os == 'android'",

mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsHTTPSOnlyModeTest.kt

@@ -6,7 +6,6 @@ package org.mozilla.fenix.ui
 
 import androidx.compose.ui.test.junit4.AndroidComposeTestRule
 import androidx.core.net.toUri
-import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.customannotations.SmokeTest
@@ -36,15 +35,6 @@ class SettingsHTTPSOnlyModeTest : TestSetup() {
             HomeActivityIntentTestRule.withDefaultSettingsOverrides(),
         ) { it.activity }
 
-    @Before
-    fun setup() {
-        sessionRule.setPrefsUntilTestEnd(
-            mapOf(
-                "dom.security.https_first" to false,
-            ),
-        )
-    }
-
     // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1724825
     @Test
     fun httpsOnlyModeMenuItemsTest() {

mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/AutofillDelegateTest.kt

@@ -11,7 +11,6 @@ import android.view.View
 import androidx.test.filters.MediumTest
 import org.hamcrest.Matchers.* // ktlint-disable no-wildcard-imports
 import org.junit.Assume.assumeThat
-import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.Parameterized
@@ -47,15 +46,6 @@ class AutofillDelegateTest : BaseSessionTest() {
         }
     }
 
-    @Before
-    fun setup() {
-        sessionRule.setPrefsUntilTestEnd(
-            mapOf(
-                "dom.security.https_first" to false,
-            ),
-        )
-    }
-
     @Test fun autofillCommit() {
         sessionRule.setPrefsUntilTestEnd(
             mapOf(

mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/NavigationDelegateTest.kt

@@ -695,11 +695,8 @@ class NavigationDelegateTest : BaseSessionTest() {
     }
 
     @Test fun loadHSTSBadCert() {
-        sessionRule.setPrefsUntilTestEnd(
-            mapOf(
-                "dom.security.https_first" to false,
-            ),
-        )
+        val httpsFirstPref = "dom.security.https_first"
+        assertThat("https pref should be false", sessionRule.getPrefs(httpsFirstPref)[0] as Boolean, equalTo(false))
 
         // load secure url with hsts header
         val uri = "https://example.com/tests/junit/hsts_header.sjs"

modules/libpref/init/StaticPrefList.yaml

@@ -3798,7 +3798,7 @@
 # downgraded again if the request failed.
 - name: dom.security.https_first
   type: RelaxedAtomicBool
-  value: @IS_NIGHTLY_BUILD@
+  value: false
   mirror: always
 
 # If true, top-level requests in Private Browsing Mode will get

toolkit/components/alerts/test/browser_bug1682866.js

@@ -1,6 +1,6 @@
 const baseURL = getRootDirectory(gTestPath).replace(
   "chrome://mochitests/content",
-  "https://example.com"
+  "http://example.com"
 );
 
 const alertURL = `${baseURL}file_bug1682866.html`;

toolkit/components/antitracking/bouncetrackingprotection/test/browser/browser.toml

@@ -1,7 +1,6 @@
 [DEFAULT]
 head = "head.js"
 prefs = [
-  "dom.security.https_first=false", # Do not upgrade ORIGIN_TRACKER_B, all other origins are already HTTPS
   "privacy.bounceTrackingProtection.enabled=true",
   "privacy.bounceTrackingProtection.enableTestMode=true",
   "privacy.bounceTrackingProtection.bounceTrackingPurgeTimerPeriodSec=0",
@@ -37,6 +36,6 @@ support-files = [
 ["browser_bouncetracking_telemetry_purge_duration.js"]
 
 ["browser_bouncetracking_webAuthUserActivation.js"]
-support-files = ["!/dom/webauthn/tests/browser/head.js"]
+support-files = [ "!/dom/webauthn/tests/browser/head.js"]
 
 ["browser_bouncetracking_telemetry_purge_count.js"]

toolkit/components/extensions/test/mochitest/mochitest-common.toml

@@ -592,7 +592,6 @@ https_first_disabled = true
 skip-if = ["os == 'android'"] # Bug 1845906 (skip-if added for Fennec)
 
 ["test_ext_webrequest_worker.html"]
-https_first_disabled = true
 
 ["test_ext_window_postMessage.html"]
 skip-if = [