Merging upstream version 126.0.

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

29 files changed, 115 insertions, 54 deletions

diff --git a/toolkit/content/tests/widgets/chrome.toml b/toolkit/content/tests/widgets/chrome.toml
index 18fe0d153a..fa10249e89 100644
--- a/toolkit/content/tests/widgets/chrome.toml
+++ b/toolkit/content/tests/widgets/chrome.toml
@@ -5,7 +5,7 @@ support-files = [
   "popup_shared.js",
   "window_label_checkbox.xhtml",
   "window_menubar.xhtml",
-  "seek_with_sound.ogg",
+  "seek_with_sound.webm",
 ]
 prefs = ["app.support.baseURL='https://support.mozilla.org/'"]
 
@@ -63,7 +63,7 @@ skip-if = [
 ["test_videocontrols_focus.html"]
 support-files = [
   "head.js",
-  "video.ogg",
+  "video.webm",
 ]
 skip-if = [
   "os == 'android'",
diff --git a/toolkit/content/tests/widgets/file_videocontrols_jsdisabled.html b/toolkit/content/tests/widgets/file_videocontrols_jsdisabled.html
index 56917b69ac..95dba91eea 100644
--- a/toolkit/content/tests/widgets/file_videocontrols_jsdisabled.html
+++ b/toolkit/content/tests/widgets/file_videocontrols_jsdisabled.html
@@ -1,2 +1,2 @@
-<video src="seek_with_sound.ogg" controls autoplay=true></video>
+<video src="seek_with_sound.webm" controls autoplay=true></video>
 <script>window.testExpando = true;</script>
diff --git a/toolkit/content/tests/widgets/head.js b/toolkit/content/tests/widgets/head.js
index d7473fa92d..2a72845a27 100644
--- a/toolkit/content/tests/widgets/head.js
+++ b/toolkit/content/tests/widgets/head.js
@@ -51,7 +51,7 @@ function executeTests() {
 }
 
 function once(target, name, cb) {
-  let p = new Promise(function (resolve, reject) {
+  let p = new Promise(function (resolve) {
     target.addEventListener(
       name,
       function () {
diff --git a/toolkit/content/tests/widgets/mochitest.toml b/toolkit/content/tests/widgets/mochitest.toml
index 7e20352256..efd86f1208 100644
--- a/toolkit/content/tests/widgets/mochitest.toml
+++ b/toolkit/content/tests/widgets/mochitest.toml
@@ -5,8 +5,8 @@ support-files = [
   "file_videocontrols_jsdisabled.html",
   "image.png",
   "image-zh.png",
-  "seek_with_sound.ogg",
-  "video.ogg",
+  "seek_with_sound.webm",
+  "video.webm",
   "head.js",
   "tree_shared.js",
   "test-webvtt-1.vtt",
@@ -97,7 +97,10 @@ skip-if = [
 ["test_videocontrols_size.html"]
 
 ["test_videocontrols_standalone.html"]
-skip-if = ["os == 'android'"] # bug 1075573
+skip-if = [
+  "os == 'linux'", # bug 1804621
+  "os == 'android'", # bug 1075573
+]
 
 ["test_videocontrols_video_direction.html"]
 skip-if = [
diff --git a/toolkit/content/tests/widgets/seek_with_sound.ogg b/toolkit/content/tests/widgets/seek_with_sound.ogg
deleted file mode 100644
index c86d9946bd..0000000000
--- a/toolkit/content/tests/widgets/seek_with_sound.ogg
+++ /dev/null
diff --git a/toolkit/content/tests/widgets/seek_with_sound.webm b/toolkit/content/tests/widgets/seek_with_sound.webm
new file mode 100644
index 0000000000..dd60cc5a0a
--- /dev/null
+++ b/toolkit/content/tests/widgets/seek_with_sound.webm
diff --git a/toolkit/content/tests/widgets/test_moz_button.html b/toolkit/content/tests/widgets/test_moz_button.html
index 473b2d1a1c..a849ccc956 100644
--- a/toolkit/content/tests/widgets/test_moz_button.html
+++ b/toolkit/content/tests/widgets/test_moz_button.html
@@ -75,24 +75,23 @@
         color: "--button-text-color-primary",
         height: "--button-min-height",
       });
-
       assertButtonPropertiesMatch(four, {
         width: "--button-size-icon",
         height: "--button-size-icon",
         backgroundColor: "--button-background-color",
-        fill: "--button-text-color",
+        fill: "--icon-color",
       });
       assertButtonPropertiesMatch(five, {
         width: "--button-size-icon",
         height: "--button-size-icon",
         backgroundColor: "transparent",
-        fill: "--button-text-color",
+        fill: "--icon-color",
       });
       assertButtonPropertiesMatch(six, {
         width: "--button-size-icon",
         height: "--button-size-icon",
         backgroundColor: "transparent",
-        fill: "--button-text-color",
+        fill: "--icon-color",
       });
 
       buttons.forEach(btn => (btn.size = "small"));
diff --git a/toolkit/content/tests/widgets/test_moz_card.html b/toolkit/content/tests/widgets/test_moz_card.html
index ef4e67d0fa..aa9ecfde31 100644
--- a/toolkit/content/tests/widgets/test_moz_card.html
+++ b/toolkit/content/tests/widgets/test_moz_card.html
@@ -13,6 +13,11 @@
 
 <body>
   <p id="display"></p>
+  <style>
+    moz-card.withHeadingIcon::part(icon) {
+      background-image: url("chrome://browser/skin/preferences/category-general.svg");
+    }
+  </style>
   <div id="content">
     <moz-card id="default-card" data-l10n-id="test-id-1" data-l10n-attrs="heading">
       <div>TEST</div>
@@ -25,6 +30,12 @@
     </moz-card>
     <hr />
 
+    <moz-card id="heading-icon-card" data-l10n-id="test-id-3" data-l10n-attrs="heading" heading="heading with icon"
+      type="accordion" icon class="withHeadingIcon">
+      <div>heading icon test content</div>
+    </moz-card>
+    <hr />
+
   </div>
   <pre id="test"></pre>
   <script>
@@ -58,12 +69,16 @@
 
     }
 
-    function assertAccordionCardProperties(card, expectedValues) {
+    function assertAccordionCardProperties(card) {
       ok(card.detailsEl, "The details element should exist");
       ok(card.detailsEl.querySelector("summary"), "There should be a summary element within the details element");
       ok(card.detailsEl.querySelector("summary").querySelector(".chevron-icon"), "There should be a chevron icon div within the summary element");
     }
 
+    function assertHeadingIconCardProperties(card) {
+      ok(card.shadowRoot.querySelector("#heading-wrapper").querySelector("#heading-icon"), "The heading icon element should exist");
+    }
+
     async function generateCard(values) {
       let card = document.createElement("moz-card");
       for (let [key, value] of Object.entries(values)) {
@@ -152,6 +167,54 @@
       );
     });
 
+    add_task(async function testHeadingIconCard() {
+      assertBasicProperties(document.getElementById("heading-icon-card"),
+        {
+          "data-l10n-id": "test-id-3",
+          "data-l10n-attrs": "heading",
+          contentText: "heading icon test content",
+          headingText: "heading with icon",
+        }
+      );
+      assertHeadingIconCardProperties(document.getElementById("heading-icon-card"),
+        {
+          "data-l10n-id": "test-id-3",
+          "data-l10n-attrs": "heading",
+          contentText: "heading icon test content",
+          headingText: "heading with icon",
+        }
+      );
+
+      let headingIconCard = await generateCard(
+        {
+          class: "heading-icon-class",
+          type: "accordion",
+          icon: "",
+          id: "generated-heading-icon-card",
+          "data-l10n-id": "generated-id-3",
+          "data-l10n-attrs": "heading",
+          heading: testHeading
+        }
+      );
+
+      assertBasicProperties(headingIconCard,
+        {
+          "data-l10n-id": "generated-id-3",
+          "data-l10n-attrs": "heading",
+          headingText: testHeading,
+          contentText: generatedSlotText,
+        }
+      );
+      assertHeadingIconCardProperties(headingIconCard,
+        {
+          "data-l10n-id": "generated-id-3",
+          "data-l10n-attrs": "heading",
+          headingText: testHeading,
+          contentText: generatedSlotText,
+        }
+      );
+    });
+
   </script>
 </body>
 
diff --git a/toolkit/content/tests/widgets/test_popupreflows.xhtml b/toolkit/content/tests/widgets/test_popupreflows.xhtml
index c3f8068779..c014d6bee4 100644
--- a/toolkit/content/tests/widgets/test_popupreflows.xhtml
+++ b/toolkit/content/tests/widgets/test_popupreflows.xhtml
@@ -20,7 +20,7 @@ let panel, anchor;
 // done by the panel.
 let observer = {
   reflows: [],
-  reflow (start, end) {
+  reflow () {
     // Ignore reflows triggered by native code
     // (Reflows from native code only have an empty stack after the first frame)
     var path = (new Error().stack).split("\n").slice(1).join("");
@@ -31,7 +31,7 @@ let observer = {
     this.reflows.push(new Error().stack);
   },
 
-  reflowInterruptible (start, end) {
+  reflowInterruptible () {
     // We're not interested in interruptible reflows.  Why, you ask?  Because
     // we've simply cargo-culted this test from browser_tabopen_reflows.js!
   },
diff --git a/toolkit/content/tests/widgets/test_videocontrols.html b/toolkit/content/tests/widgets/test_videocontrols.html
index 076b4350fd..f2fc53a1cc 100644
--- a/toolkit/content/tests/widgets/test_videocontrols.html
+++ b/toolkit/content/tests/widgets/test_videocontrols.html
@@ -184,7 +184,7 @@ add_task(async function setup() {
       ]});
   await new Promise(resolve => {
     video.addEventListener("canplaythrough", resolve, {once: true});
-    video.src = "seek_with_sound.ogg";
+    video.src = "seek_with_sound.webm";
   });
 
   video.addEventListener("play", captureEventThenCheck);
@@ -437,7 +437,7 @@ add_task(async function click_and_hold_slider() {
  * Bug 1402877: Don't let click event dispatch through media controls to video element.
  */
 add_task(async function click_event_dispatch() {
-  const clientScriptClickHandler = (e) => {
+  const clientScriptClickHandler = () => {
     ok(false, "Should not receive the event");
   };
   video.addEventListener("click", clientScriptClickHandler);
diff --git a/toolkit/content/tests/widgets/test_videocontrols_audio.html b/toolkit/content/tests/widgets/test_videocontrols_audio.html
index ad528f4c27..0a7a2dcbc3 100644
--- a/toolkit/content/tests/widgets/test_videocontrols_audio.html
+++ b/toolkit/content/tests/widgets/test_videocontrols_audio.html
@@ -18,7 +18,7 @@
 <script>
 
   const video = document.getElementById("video");
-  function loadedmetadata(event) {
+  function loadedmetadata() {
     SimpleTest.executeSoon(function() {
       const controlBar = SpecialPowers.wrap(video).openOrClosedShadowRoot.querySelector(".controlBar");
       is(controlBar.getAttribute("fullscreen-unavailable"), "true", "Fullscreen button is hidden");
diff --git a/toolkit/content/tests/widgets/test_videocontrols_closed_caption_menu.html b/toolkit/content/tests/widgets/test_videocontrols_closed_caption_menu.html
index 39d6ff494f..5a2602d204 100644
--- a/toolkit/content/tests/widgets/test_videocontrols_closed_caption_menu.html
+++ b/toolkit/content/tests/widgets/test_videocontrols_closed_caption_menu.html
@@ -49,7 +49,7 @@
       ["media.videocontrols.keyboard-tab-to-all-controls", true],
     ]}, done);
   }, done => {
-    video.src = "seek_with_sound.ogg";
+    video.src = "seek_with_sound.webm";
     video.addEventListener("loadedmetadata", done);
   }, cleanup);
 
diff --git a/toolkit/content/tests/widgets/test_videocontrols_error.html b/toolkit/content/tests/widgets/test_videocontrols_error.html
index af90a4672a..922726d5be 100644
--- a/toolkit/content/tests/widgets/test_videocontrols_error.html
+++ b/toolkit/content/tests/widgets/test_videocontrols_error.html
@@ -27,7 +27,7 @@
 
   add_task(async function check_normal_status() {
     await new Promise(resolve => {
-      video.src = "seek_with_sound.ogg";
+      video.src = "seek_with_sound.webm";
       video.addEventListener("loadedmetadata", () => SimpleTest.executeSoon(resolve));
     });
 
@@ -44,7 +44,7 @@
     const errorType = "errorNoSource";
 
     await new Promise(resolve => {
-      video.src = "invalid_source.ogg";
+      video.src = "invalid_source.webm";
       video.addEventListener("error", () => SimpleTest.executeSoon(resolve));
     });
 
diff --git a/toolkit/content/tests/widgets/test_videocontrols_focus.html b/toolkit/content/tests/widgets/test_videocontrols_focus.html
index 0982947ffe..e19262bf6e 100644
--- a/toolkit/content/tests/widgets/test_videocontrols_focus.html
+++ b/toolkit/content/tests/widgets/test_videocontrols_focus.html
@@ -36,7 +36,7 @@ add_task(async function setup() {
   video.controls = true;
   video.preload = "auto";
   video.loop = true;
-  video.src = "video.ogg";
+  video.src = "video.webm";
   const caption = video.addTextTrack("captions", "English", "en");
   caption.mode = "showing";
   const content = document.getElementById("content");
diff --git a/toolkit/content/tests/widgets/test_videocontrols_iframe_fullscreen.html b/toolkit/content/tests/widgets/test_videocontrols_iframe_fullscreen.html
index 0a74b25609..d30d10b8bc 100644
--- a/toolkit/content/tests/widgets/test_videocontrols_iframe_fullscreen.html
+++ b/toolkit/content/tests/widgets/test_videocontrols_iframe_fullscreen.html
@@ -30,7 +30,7 @@
       ifr.addEventListener("load", resolve);
     }).then(() => new Promise(resolve => {
       video = ifr.contentDocument.getElementById("video");
-      video.src = "seek_with_sound.ogg";
+      video.src = "seek_with_sound.webm";
       video.addEventListener("loadedmetadata", resolve);
     })).then(() => new Promise(resolve => {
       const available = video.ownerDocument.fullscreenEnabled;
diff --git a/toolkit/content/tests/widgets/test_videocontrols_jsdisabled.html b/toolkit/content/tests/widgets/test_videocontrols_jsdisabled.html
index f3fdecc47f..16cf2b92e0 100644
--- a/toolkit/content/tests/widgets/test_videocontrols_jsdisabled.html
+++ b/toolkit/content/tests/widgets/test_videocontrols_jsdisabled.html
@@ -45,7 +45,7 @@ SpecialPowers.pushPrefEnv({"set": [["javascript.enabled", false]]}, startTest);
 var testnum = 1;
 
 var video;
-function loadevent(event) {
+function loadevent() {
   is(win.testExpando, undefined, "expando shouldn't exist because js is disabled");
   video = win.document.querySelector("video");
   // Other events expected by the test.
diff --git a/toolkit/content/tests/widgets/test_videocontrols_keyhandler.html b/toolkit/content/tests/widgets/test_videocontrols_keyhandler.html
index 5b771fc745..9737a9fff2 100644
--- a/toolkit/content/tests/widgets/test_videocontrols_keyhandler.html
+++ b/toolkit/content/tests/widgets/test_videocontrols_keyhandler.html
@@ -31,7 +31,7 @@
       ["media.videocontrols.keyboard-tab-to-all-controls", true],
     ]}, done);
   }, done => {
-    video.src = "seek_with_sound.ogg";
+    video.src = "seek_with_sound.webm";
     video.addEventListener("loadedmetadata", done);
   });
 
diff --git a/toolkit/content/tests/widgets/test_videocontrols_onclickplay.html b/toolkit/content/tests/widgets/test_videocontrols_onclickplay.html
index 9023512ab7..3b1bd4653c 100644
--- a/toolkit/content/tests/widgets/test_videocontrols_onclickplay.html
+++ b/toolkit/content/tests/widgets/test_videocontrols_onclickplay.html
@@ -22,11 +22,11 @@ var video = document.getElementById("video");
 
 function startMediaLoad() {
   // Kick off test once video has loaded, in its canplaythrough event handler.
-  video.src = "seek_with_sound.ogg";
+  video.src = "seek_with_sound.webm";
   video.addEventListener("canplaythrough", runTest);
 }
 
-function loadevent(event) {
+function loadevent() {
   SpecialPowers.pushPrefEnv({"set": [["media.cache_size", 40000]]}, startMediaLoad);
 }
 
diff --git a/toolkit/content/tests/widgets/test_videocontrols_scrubber_position.html b/toolkit/content/tests/widgets/test_videocontrols_scrubber_position.html
index b1d2ab9e74..51117e7955 100644
--- a/toolkit/content/tests/widgets/test_videocontrols_scrubber_position.html
+++ b/toolkit/content/tests/widgets/test_videocontrols_scrubber_position.html
@@ -26,7 +26,7 @@ const video = document.getElementById("video");
 add_task(async function setup() {
   await new Promise(resolve => {
     video.addEventListener("canplaythrough", resolve, {once: true});
-    video.src = "seek_with_sound.ogg";
+    video.src = "seek_with_sound.webm";
   });
 
   // Check initial state upon load
diff --git a/toolkit/content/tests/widgets/test_videocontrols_scrubber_position_nopreload.html b/toolkit/content/tests/widgets/test_videocontrols_scrubber_position_nopreload.html
index 9fbb6fbcb5..968ba5db96 100644
--- a/toolkit/content/tests/widgets/test_videocontrols_scrubber_position_nopreload.html
+++ b/toolkit/content/tests/widgets/test_videocontrols_scrubber_position_nopreload.html
@@ -13,7 +13,7 @@
 <p id="display"></p>
 
 <div id="content">
-  <video width="320" height="240" id="video" mozNoDynamicControls controls="true" preload="none" src="seek_with_sound.ogg"></video>
+  <video width="320" height="240" id="video" mozNoDynamicControls controls="true" preload="none" src="seek_with_sound.webm"></video>
 </div>
 
 <div id="host"></div>
diff --git a/toolkit/content/tests/widgets/test_videocontrols_size.html b/toolkit/content/tests/widgets/test_videocontrols_size.html
index 559cc66e86..d940b1d295 100644
--- a/toolkit/content/tests/widgets/test_videocontrols_size.html
+++ b/toolkit/content/tests/widgets/test_videocontrols_size.html
@@ -148,7 +148,7 @@
 
   testCases.push(() => Promise.all(videoElems.map(video => new Promise(resolve => {
     video.addEventListener("loadedmetadata", resolve);
-    video.src = "seek_with_sound.ogg";
+    video.src = "seek_with_sound.webm";
   }))));
 
   videoElems.forEach(video => {
diff --git a/toolkit/content/tests/widgets/test_videocontrols_standalone.html b/toolkit/content/tests/widgets/test_videocontrols_standalone.html
index 14208923dd..1eaa026cdc 100644
--- a/toolkit/content/tests/widgets/test_videocontrols_standalone.html
+++ b/toolkit/content/tests/widgets/test_videocontrols_standalone.html
@@ -22,7 +22,7 @@ function getMediaElement(aWindow) {
   return aWindow.document.getElementsByTagName("video")[0];
 }
 
-var popup = window.open("seek_with_sound.ogg");
+var popup = window.open("seek_with_sound.webm");
 popup.addEventListener("load", function() {
   var video = getMediaElement(popup);
 
diff --git a/toolkit/content/tests/widgets/test_videocontrols_video_noaudio.html b/toolkit/content/tests/widgets/test_videocontrols_video_noaudio.html
index bfc8018466..99d5bdad01 100644
--- a/toolkit/content/tests/widgets/test_videocontrols_video_noaudio.html
+++ b/toolkit/content/tests/widgets/test_videocontrols_video_noaudio.html
@@ -23,7 +23,7 @@
   add_task(async function setup() {
     await SpecialPowers.pushPrefEnv({"set": [["media.cache_size", 40000]]});
     await new Promise(resolve => {
-      video.src = "video.ogg";
+      video.src = "video.webm";
       video.addEventListener("loadedmetadata", () => SimpleTest.executeSoon(resolve));
     });
   });
diff --git a/toolkit/content/tests/widgets/test_videocontrols_vtt.html b/toolkit/content/tests/widgets/test_videocontrols_vtt.html
index 2f8d70f35a..33b8bcf24e 100644
--- a/toolkit/content/tests/widgets/test_videocontrols_vtt.html
+++ b/toolkit/content/tests/widgets/test_videocontrols_vtt.html
@@ -26,7 +26,7 @@
   add_task(async function wait_for_media_ready() {
     await SpecialPowers.pushPrefEnv({"set": [["media.cache_size", 40000]]});
     await new Promise(resolve => {
-      video.src = "seek_with_sound.ogg";
+      video.src = "seek_with_sound.webm";
       video.addEventListener("loadedmetadata", resolve);
     });
   });
diff --git a/toolkit/content/tests/widgets/tree_shared.js b/toolkit/content/tests/widgets/tree_shared.js
index ba52bf828e..2cc40686ec 100644
--- a/toolkit/content/tests/widgets/tree_shared.js
+++ b/toolkit/content/tests/widgets/tree_shared.js
@@ -321,11 +321,7 @@ function testtag_tree_columns(tree, expectedColumns, testid) {
     // check the view's getColumnProperties method
     var properties = tree.view.getColumnProperties(column);
     var expectedProperties = expectedColumn.properties;
-    is(
-      properties,
-      expectedProperties ? expectedProperties : "",
-      adjtestid + "getColumnProperties"
-    );
+    is(properties, expectedProperties || "", adjtestid + "getColumnProperties");
   }
 
   is(columns.getFirstColumn(), columns[0], testid + "getFirstColumn");
@@ -574,10 +570,10 @@ function testtag_tree_TreeSelection_UI(tree, testid, multiple) {
 
   var keydownFired = 0;
   var keypressFired = 0;
-  function keydownListener(event) {
+  function keydownListener() {
     keydownFired++;
   }
-  function keypressListener(event) {
+  function keypressListener() {
     keypressFired++;
   }
 
@@ -1307,7 +1303,7 @@ function testtag_tree_TreeView_rows(tree, testid, rowInfo, startRow) {
     isContainer(row) {
       return row.container;
     },
-    isContainerOpen(row) {
+    isContainerOpen() {
       return false;
     },
     isContainerEmpty(row) {
@@ -1325,7 +1321,7 @@ function testtag_tree_TreeView_rows(tree, testid, rowInfo, startRow) {
     getParentIndex(row) {
       return row.parent;
     },
-    hasNextSibling(row) {
+    hasNextSibling() {
       return r < startRow + length - 1;
     },
   };
@@ -1433,7 +1429,7 @@ function testtag_tree_TreeView_rows(tree, testid, rowInfo, startRow) {
   }
 }
 
-function testtag_tree_TreeView_rows_sort(tree, testid, rowInfo) {
+function testtag_tree_TreeView_rows_sort(tree) {
   // check if cycleHeader sorts the columns
   var columnIndex = 0;
   var view = tree.view;
@@ -1734,7 +1730,7 @@ function testtag_tree_wheel(aTree) {
 
   var defaultPrevented = 0;
 
-  function wheelListener(event) {
+  function wheelListener() {
     defaultPrevented++;
   }
   window.addEventListener("wheel", wheelListener);
@@ -2109,7 +2105,7 @@ function mouseClickOnColumnHeader(
   }
 }
 
-function mouseDblClickOnCell(tree, row, column, testname) {
+function mouseDblClickOnCell(tree, row, column) {
   // select the row we will edit
   var selection = tree.view.selection;
   selection.select(row);
@@ -2151,12 +2147,12 @@ function convertDOMtoTreeRowInfo(treechildren, level, rowidx) {
       for (var c = 0; c < treerow.childNodes.length; c++) {
         var cell = treerow.childNodes[c];
         cellInfo.push({
-          label: "" + cell.getAttribute("label"),
-          value: cell.getAttribute("value"),
-          properties: cell.getAttribute("properties"),
+          label: cell.getAttribute("label") || "",
+          value: cell.getAttribute("value") || "",
+          properties: cell.getAttribute("properties") || "",
           editable: cell.getAttribute("editable") != "false",
           selectable: cell.getAttribute("selectable") != "false",
-          image: cell.getAttribute("src"),
+          image: cell.getAttribute("src") || "",
           mode: cell.hasAttribute("mode")
             ? parseInt(cell.getAttribute("mode"))
             : 3,
@@ -2170,7 +2166,7 @@ function convertDOMtoTreeRowInfo(treechildren, level, rowidx) {
           : convertDOMtoTreeRowInfo(descendants, level + 1, rowidx);
       obj.rows.push({
         cells: cellInfo,
-        properties: treerow.getAttribute("properties"),
+        properties: treerow.getAttribute("properties") || "",
         container: treeitem.getAttribute("container") == "true",
         separator: treeitem.localName == "treeseparator",
         children,
diff --git a/toolkit/content/tests/widgets/video.ogg b/toolkit/content/tests/widgets/video.ogg
deleted file mode 100644
index ac7ece3519..0000000000
--- a/toolkit/content/tests/widgets/video.ogg
+++ /dev/null
diff --git a/toolkit/content/tests/widgets/video.webm b/toolkit/content/tests/widgets/video.webm
new file mode 100644
index 0000000000..87a8d837a8
--- /dev/null
+++ b/toolkit/content/tests/widgets/video.webm
diff --git a/toolkit/content/tests/widgets/videocontrols_direction_test.js b/toolkit/content/tests/widgets/videocontrols_direction_test.js
index e937f06b3f..608a39cc5b 100644
--- a/toolkit/content/tests/widgets/videocontrols_direction_test.js
+++ b/toolkit/content/tests/widgets/videocontrols_direction_test.js
@@ -26,7 +26,7 @@ RemoteCanvas.prototype.load = function (callback) {
     var m = iframe.contentDocument.getElementById("av");
     m.addEventListener(
       "suspend",
-      function (aEvent) {
+      function () {
         setTimeout(function () {
           let mediaElement =
             iframe.contentDocument.querySelector("audio, video");
diff --git a/toolkit/content/tests/widgets/window_menubar.xhtml b/toolkit/content/tests/widgets/window_menubar.xhtml
index c4ced844ad..ded1361365 100644
--- a/toolkit/content/tests/widgets/window_menubar.xhtml
+++ b/toolkit/content/tests/widgets/window_menubar.xhtml
@@ -426,7 +426,7 @@ var popupTests = [
   test() {
     synthesizeKey("KEY_Escape");
   },
-  result(testname) {
+  result() {
   },
 },
 {
@@ -504,14 +504,14 @@ var popupTests = [
   testname: "cursor up wrap",
   events: [ "DOMMenuItemInactive contents", "DOMMenuItemActive about" ],
   test() { synthesizeKey("KEY_ArrowUp"); },
-  result(testname) { }
+  result() { }
 },
 {
   // check that pressing cursor down skips non menuitems
   testname: "cursor down wrap",
   events: [ "DOMMenuItemInactive about", "DOMMenuItemActive contents" ],
   test() { synthesizeKey("KEY_ArrowDown"); },
-  result(testname) { }
+  result() { }
 },
 {
   // check that pressing a menuitem's accelerator selects it
@@ -617,7 +617,7 @@ var popupTests = [
   condition() { return kIsWindows; },
   events: [ "DOMMenuItemInactive only", "DOMMenuItemActive other" ],
   test() { sendChar("o"); },
-  result(testname) { }
+  result() { }
 },
 {
   // when only one menuitem starting with that letter exists, it should be