Merging upstream version 126.0.

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

1 files changed, 27 insertions, 16 deletions

diff --git a/toolkit/content/aboutSupport.js b/toolkit/content/aboutSupport.js
index f9f35e7e76..6b75776bd6 100644
--- a/toolkit/content/aboutSupport.js
+++ b/toolkit/content/aboutSupport.js
@@ -20,7 +20,7 @@ ChromeUtils.defineESModuleGetters(this, {
   ProcessType: "resource://gre/modules/ProcessType.sys.mjs",
 });
 
-window.addEventListener("load", function onload(event) {
+window.addEventListener("load", function onload() {
   try {
     window.removeEventListener("load", onload);
     Troubleshoot.snapshot().then(async snapshot => {
@@ -1051,7 +1051,7 @@ var snapshotFormatters = {
       }
       let button = $("enumerate-database-button");
       if (button) {
-        button.addEventListener("click", function (event) {
+        button.addEventListener("click", function () {
           let { KeyValueService } = ChromeUtils.importESModule(
             "resource://gre/modules/kvstore.sys.mjs"
           );
@@ -1074,7 +1074,7 @@ var snapshotFormatters = {
                 $("enumerate-database-result").textContent +=
                   logs.join("\n") + "\n";
               })
-              .catch(err => {
+              .catch(() => {
                 $("enumerate-database-result").textContent += `${name}:\n`;
               });
           }
@@ -1105,7 +1105,7 @@ var snapshotFormatters = {
             'th[data-l10n-id="roundtrip-latency"]'
           ).nextSibling.textContent = latencyString;
         })
-        .catch(e => {});
+        .catch(() => {});
     }
 
     function createCDMInfoRow(cdmInfo) {
@@ -1369,6 +1369,17 @@ var snapshotFormatters = {
     $("remote-debugging-url").textContent = data.url;
   },
 
+  contentAnalysis(data) {
+    $("content-analysis-active").textContent = data.active;
+    if (data.active) {
+      $("content-analysis-connected-to-agent").textContent = data.connected;
+      $("content-analysis-agent-path").textContent = data.agentPath;
+      $("content-analysis-agent-failed-signature-verification").textContent =
+        data.failedSignatureVerification;
+      $("content-analysis-request-count").textContent = data.requestCount;
+    }
+  },
+
   accessibility(data) {
     $("a11y-activated").textContent = data.isActive;
     $("a11y-force-disabled").textContent = data.forceDisabled || 0;
@@ -1606,7 +1617,7 @@ function sortedArrayFromObject(obj) {
   for (let prop in obj) {
     tuples.push([prop, obj[prop]]);
   }
-  tuples.sort(([prop1, v1], [prop2, v2]) => prop1.localeCompare(prop2));
+  tuples.sort(([prop1], [prop2]) => prop1.localeCompare(prop2));
   return tuples;
 }
 
@@ -1757,7 +1768,7 @@ Serializer.prototype = {
     }
   },
 
-  _startNewLine(lines) {
+  _startNewLine() {
     let currLine = this._currentLine;
     if (currLine) {
       // The current line is not empty.  Trim it.
@@ -1770,7 +1781,7 @@ Serializer.prototype = {
     this._lines.push("");
   },
 
-  _appendText(text, lines) {
+  _appendText(text) {
     this._currentLine += text;
   },
 
@@ -1926,13 +1937,13 @@ function safeModeRestart() {
 function setupEventListeners() {
   let button = $("reset-box-button");
   if (button) {
-    button.addEventListener("click", function (event) {
+    button.addEventListener("click", function () {
       ResetProfile.openConfirmationDialog(window);
     });
   }
   button = $("clear-startup-cache-button");
   if (button) {
-    button.addEventListener("click", async function (event) {
+    button.addEventListener("click", async function () {
       const [promptTitle, promptBody, restartButtonLabel] =
         await document.l10n.formatValues([
           { id: "startup-cache-dialog-title2" },
@@ -1965,7 +1976,7 @@ function setupEventListeners() {
   }
   button = $("restart-in-safe-mode-button");
   if (button) {
-    button.addEventListener("click", function (event) {
+    button.addEventListener("click", function () {
       if (
         Services.obs
           .enumerateObservers("restart-in-safe-mode")
@@ -1983,7 +1994,7 @@ function setupEventListeners() {
   if (AppConstants.MOZ_UPDATER) {
     button = $("update-dir-button");
     if (button) {
-      button.addEventListener("click", function (event) {
+      button.addEventListener("click", function () {
         // Get the update directory.
         let updateDir = Services.dirsvc.get("UpdRootD", Ci.nsIFile);
         if (!updateDir.exists()) {
@@ -2001,7 +2012,7 @@ function setupEventListeners() {
     }
     button = $("show-update-history-button");
     if (button) {
-      button.addEventListener("click", function (event) {
+      button.addEventListener("click", function () {
         window.browsingContext.topChromeWindow.openDialog(
           "chrome://mozapps/content/update/history.xhtml",
           "Update:History",
@@ -2012,7 +2023,7 @@ function setupEventListeners() {
   }
   button = $("verify-place-integrity-button");
   if (button) {
-    button.addEventListener("click", function (event) {
+    button.addEventListener("click", function () {
       PlacesDBUtils.checkAndFixDatabase().then(tasksStatusMap => {
         let logs = [];
         for (let [key, value] of tasksStatusMap) {
@@ -2027,13 +2038,13 @@ function setupEventListeners() {
     });
   }
 
-  $("copy-raw-data-to-clipboard").addEventListener("click", function (event) {
+  $("copy-raw-data-to-clipboard").addEventListener("click", function () {
     copyRawDataToClipboard(this);
   });
-  $("copy-to-clipboard").addEventListener("click", function (event) {
+  $("copy-to-clipboard").addEventListener("click", function () {
     copyContentsToClipboard();
   });
-  $("profile-dir-button").addEventListener("click", function (event) {
+  $("profile-dir-button").addEventListener("click", function () {
     openProfileDirectory();
   });
 }