Adding upstream version 126.0.upstream/126.0

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

3 files changed, 12 insertions, 2 deletions

diff --git a/toolkit/components/url-classifier/tests/mochitest/classifierCommon.js b/toolkit/components/url-classifier/tests/mochitest/classifierCommon.js
index 00a4e8d08b..bf3d35047f 100644
--- a/toolkit/components/url-classifier/tests/mochitest/classifierCommon.js
+++ b/toolkit/components/url-classifier/tests/mochitest/classifierCommon.js
@@ -63,7 +63,7 @@ function doReload() {
   }
 }
 
-// SafeBrowsing.jsm is initialized after mozEntries are added. Add observer
+// SafeBrowsing.sys.mjs is initialized after mozEntries are added. Add observer
 // to receive "finished" event. For the case when this function is called
 // after the event had already been notified, we lookup entries to see if
 // they are already added to database.
diff --git a/toolkit/components/url-classifier/tests/mochitest/classifierHelper.js b/toolkit/components/url-classifier/tests/mochitest/classifierHelper.js
index b07bfc7fc5..55870b462c 100644
--- a/toolkit/components/url-classifier/tests/mochitest/classifierHelper.js
+++ b/toolkit/components/url-classifier/tests/mochitest/classifierHelper.js
@@ -24,7 +24,7 @@ classifierHelper._updatesToCleanup = [];
 
 classifierHelper._initsCB = [];
 
-// This function return a Promise, promise is resolved when SafeBrowsing.jsm
+// This function return a Promise, promise is resolved when SafeBrowsing.sys.mjs
 // is initialized.
 classifierHelper.waitForInit = function () {
   return new Promise(function (resolve) {
diff --git a/toolkit/components/url-classifier/tests/unit/test_canonicalization.js b/toolkit/components/url-classifier/tests/unit/test_canonicalization.js
index e26bb5d84a..a9fdf71315 100644
--- a/toolkit/components/url-classifier/tests/unit/test_canonicalization.js
+++ b/toolkit/components/url-classifier/tests/unit/test_canonicalization.js
@@ -80,4 +80,14 @@ function run_test() {
     canonicalize("http://host.com//twoslashes?more//slashes"),
     "http://host.com/twoslashes?more//slashes"
   );
+  equal(
+    canonicalize("http://host.com/path?query%3Awith%3Acolons"),
+    "http://host.com/path?query:with:colons"
+  );
+  equal(
+    canonicalize(
+      "https://wiki.mozilla.org/index.php?title=MozillaWiki%3AHelp&action=history"
+    ),
+    "https://wiki.mozilla.org/index.php?title=MozillaWiki:Help&action=history"
+  );
 }