Merging upstream version 115.12.0esr.

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

4 files changed, 38 insertions, 36 deletions

diff --git a/toolkit/components/downloads/test/unit/test_DownloadPaths.js b/toolkit/components/downloads/test/unit/test_DownloadPaths.js
index 00fb070669..45be10256f 100644
--- a/toolkit/components/downloads/test/unit/test_DownloadPaths.js
+++ b/toolkit/components/downloads/test/unit/test_DownloadPaths.js
@@ -34,29 +34,29 @@ add_task(async function test_sanitize() {
   // Platform-dependent conversion of special characters to spaces.
   const kSpecialChars = 'A:*?|""<<>>;,+=[]B][=+,;>><<""|?*:C';
   if (AppConstants.platform == "android") {
-    testSanitize(kSpecialChars, "A B C");
-    testSanitize(" :: Website :: ", "Website");
-    testSanitize("* Website!", "Website!");
-    testSanitize("Website | Page!", "Website Page!");
-    testSanitize("Directory Listing: /a/b/", "Directory Listing _a_b_");
+    testSanitize(kSpecialChars, "A________________B________________C");
+    testSanitize(" :: Website :: ", "__ Website __");
+    testSanitize("* Website!", "_ Website!");
+    testSanitize("Website | Page!", "Website _ Page!");
+    testSanitize("Directory Listing: /a/b/", "Directory Listing_ _a_b_");
   } else if (AppConstants.platform == "win") {
-    testSanitize(kSpecialChars, "A ;,+=[]B][=+,; C");
-    testSanitize(" :: Website :: ", "Website");
-    testSanitize("* Website!", "Website!");
-    testSanitize("Website | Page!", "Website Page!");
-    testSanitize("Directory Listing: /a/b/", "Directory Listing _a_b_");
+    testSanitize(kSpecialChars, "A__________;,+=[]B][=+,;__________C");
+    testSanitize(" :: Website :: ", "__ Website __");
+    testSanitize("* Website!", "_ Website!");
+    testSanitize("Website | Page!", "Website _ Page!");
+    testSanitize("Directory Listing: /a/b/", "Directory Listing_ _a_b_");
   } else if (AppConstants.platform == "macosx") {
-    testSanitize(kSpecialChars, "A ;,+=[]B][=+,; C");
-    testSanitize(" :: Website :: ", "Website");
-    testSanitize("* Website!", "Website!");
-    testSanitize("Website | Page!", "Website Page!");
-    testSanitize("Directory Listing: /a/b/", "Directory Listing _a_b_");
+    testSanitize(kSpecialChars, "A__________;,+=[]B][=+,;__________C");
+    testSanitize(" :: Website :: ", "__ Website __");
+    testSanitize("* Website!", "_ Website!");
+    testSanitize("Website | Page!", "Website _ Page!");
+    testSanitize("Directory Listing: /a/b/", "Directory Listing_ _a_b_");
   } else {
-    testSanitize(kSpecialChars, "A ;,+=[]B][=+,; C");
-    testSanitize(" :: Website :: ", "Website");
-    testSanitize("* Website!", "Website!");
-    testSanitize("Website | Page!", "Website Page!");
-    testSanitize("Directory Listing: /a/b/", "Directory Listing _a_b_");
+    testSanitize(kSpecialChars, "A__________;,+=[]B][=+,;__________C");
+    testSanitize(" :: Website :: ", "__ Website __");
+    testSanitize("* Website!", "_ Website!");
+    testSanitize("Website | Page!", "Website _ Page!");
+    testSanitize("Directory Listing: /a/b/", "Directory Listing_ _a_b_");
   }
 
   // Conversion of consecutive runs of slashes and backslashes to underscores.
@@ -64,9 +64,9 @@ add_task(async function test_sanitize() {
 
   // Removal of leading and trailing whitespace and dots after conversion.
   testSanitize("  Website  ", "Website");
-  testSanitize(". . Website . Page . .", "Website . Page");
-  testSanitize(" File . txt ", "File . txt");
-  testSanitize("\f\n\r\t\v\x00\x1f\x7f\x80\x9f\xa0 . txt", "txt");
+  testSanitize(". . Website . Page . .", "Website .Page");
+  testSanitize(" File . txt ", "File .txt");
+  testSanitize("\f\n\r\t\v\x00\x1f\x7f\x80\x9f\xa0 . txt", "_________ .txt");
   testSanitize("\u1680\u180e\u2000\u2008\u200a . txt", "txt");
   testSanitize("\u2028\u2029\u202f\u205f\u3000\ufeff . txt", "txt");
 
@@ -77,25 +77,25 @@ add_task(async function test_sanitize() {
   testSanitize(" . ", "");
 
   // Stripping of BIDI formatting characters.
-  testSanitize("\u200e \u202b\u202c\u202d\u202etest\x7f\u200f", "_ ____test _");
-  testSanitize("AB\x7f\u202a\x7f\u202a\x7fCD", "AB _ _ CD");
+  testSanitize("\u200e \u202b\u202c\u202d\u202etest\x7f\u200f", "_ ____test__");
+  testSanitize("AB\x7f\u202a\x7f\u202a\x7fCD", "AB_____CD");
 
   // Stripping of colons:
-  testSanitize("foo:bar", "foo bar");
+  testSanitize("foo:bar", "foo_bar");
 
   // not compressing whitespaces.
-  testSanitize("foo : bar", "foo   bar", { compressWhitespaces: false });
+  testSanitize("foo :  bar", "foo _  bar", { compressWhitespaces: false });
 
   testSanitize("thing.lnk", "thing.lnk.download");
-  testSanitize("thing.lnk\n", "thing.lnk.download");
+  testSanitize("thing.lnk\n", "thing.lnk_");
   testSanitize("thing.lnk", "thing.lnk", {
     allowInvalidFilenames: true,
   });
-  testSanitize("thing.lnk\n", "thing.lnk", {
+  testSanitize("thing.lnk\n", "thing.lnk_", {
     allowInvalidFilenames: true,
   });
   testSanitize("thing.URl", "thing.URl.download");
-  testSanitize("thing.URl  \n", "thing.URl", {
+  testSanitize("thing.URl  \n", "thing.URl_", {
     allowInvalidFilenames: true,
   });
 
@@ -107,12 +107,12 @@ add_task(async function test_sanitize() {
     allowInvalidFilenames: true,
   });
 
-  testSanitize("thing.local|", "thing.local.download");
-  testSanitize("thing.lo|cal", "thing.lo cal");
-  testSanitize('thing.local/*"', "thing.local_");
+  testSanitize("thing.local|", "thing.local_");
+  testSanitize("thing.lo|cal", "thing.lo_cal");
+  testSanitize('thing.local/*"', "thing.local___");
 
   testSanitize("thing.desktoP", "thing.desktoP.download");
-  testSanitize("thing.desktoP  \n", "thing.desktoP", {
+  testSanitize("thing.desktoP  \n", "thing.desktoP_", {
     allowInvalidFilenames: true,
   });
 });
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_downloads_urlencoded.js b/toolkit/components/extensions/test/xpcshell/test_ext_downloads_urlencoded.js
index 03288fb5d5..7e9b3a4fee 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_downloads_urlencoded.js
+++ b/toolkit/components/extensions/test/xpcshell/test_ext_downloads_urlencoded.js
@@ -83,7 +83,7 @@ add_task(async function test_decoded_filename_download() {
   const FILE_NAME_DECODED_2 = "file\u{0001F6B2}encoded.txt";
   const FILE_NAME_ENCODED_URL_2 = BASE + "/" + FILE_NAME_ENCODED_2;
   const FILE_NAME_ENCODED_3 = "file%X%20encode.txt";
-  const FILE_NAME_DECODED_3 = "file%X encode.txt";
+  const FILE_NAME_DECODED_3 = "file_X encode.txt";
   const FILE_NAME_ENCODED_URL_3 = BASE + "/" + FILE_NAME_ENCODED_3;
   const FILE_NAME_ENCODED_4 = "file%E3%80%82encode.txt";
   const FILE_NAME_DECODED_4 = "file\u3002encode.txt";
diff --git a/toolkit/components/maintenanceservice/bootstrapinstaller/maintenanceservice_installer.nsi b/toolkit/components/maintenanceservice/bootstrapinstaller/maintenanceservice_installer.nsi
index 685458db0e..88e994b3bd 100644
--- a/toolkit/components/maintenanceservice/bootstrapinstaller/maintenanceservice_installer.nsi
+++ b/toolkit/components/maintenanceservice/bootstrapinstaller/maintenanceservice_installer.nsi
@@ -205,7 +205,7 @@ Section "MaintenanceService"
   ; These keys are used to bypass the installation dir is a valid installation
   ; check from the service so that tests can be run.
   WriteRegStr HKLM "${FallbackKey}\0" "name" "Mozilla Corporation"
-  WriteRegStr HKLM "${FallbackKey}\0" "issuer" "DigiCert SHA2 Assured ID Code Signing CA"
+  WriteRegStr HKLM "${FallbackKey}\0" "issuer" "DigiCert Trusted G4 Code Signing RSA4096 SHA384 2021 CA1"
   WriteRegStr HKLM "${FallbackKey}\1" "name" "Mozilla Fake SPC"
   WriteRegStr HKLM "${FallbackKey}\1" "issuer" "Mozilla Fake CA"
   ${If} ${RunningX64}
diff --git a/toolkit/components/telemetry/tests/marionette/harness/telemetry_harness/fog_testcase.py b/toolkit/components/telemetry/tests/marionette/harness/telemetry_harness/fog_testcase.py
index c5bc54e9d2..9bcf29d2f4 100644
--- a/toolkit/components/telemetry/tests/marionette/harness/telemetry_harness/fog_testcase.py
+++ b/toolkit/components/telemetry/tests/marionette/harness/telemetry_harness/fog_testcase.py
@@ -55,6 +55,8 @@ class FOGTestCase(TelemetryTestCase):
                 "logging.fog_control::*": 5,
                 "logging.glean::*": 5,
                 "logging.glean_core::*": 5,
+                # Slow down the user inactivity timeout (bug 1690728)
+                "dom.events.user_interaction_interval": 60000,
             }
         )