From 6a96b612b66390e040ad11b1f018e77699f588ac Mon Sep 17 00:00:00 2001
From: Narcis Beleuzu <nbeleuzu@mozilla.com>
Date: Thu, 24 Oct 2019 13:47:37 +0300
Subject: [PATCH] Backed out 5 changesets (bug 1556854) for mda failures on
 /test_media_selection.html CLOSED TREE

Backed out changeset 61a4022333fa (bug 1556854)
Backed out changeset cfd809c63877 (bug 1556854)
Backed out changeset 057cc9878594 (bug 1556854)
Backed out changeset 0f02ff8a5c67 (bug 1556854)
Backed out changeset 8719996c65b3 (bug 1556854)
---
 .eslintignore                                 |    6 +-
 dom/media/test/AutoplayTestUtils.js           |   31 +-
 dom/media/test/background_video.js            |   74 +-
 dom/media/test/can_play_type_dash.js          |    8 +-
 dom/media/test/can_play_type_ogg.js           |   44 +-
 dom/media/test/can_play_type_wave.js          |    6 +-
 dom/media/test/can_play_type_webm.js          |   30 +-
 dom/media/test/chromeHelper.js                |   12 +-
 .../test/cloneElementVisually_helpers.js      |   32 +-
 dom/media/test/eme.js                         |  314 +--
 ...file_autoplay_policy_activation_frame.html |    2 +-
 ..._autoplay_policy_eventdown_activation.html |    8 +-
 dom/media/test/fragment_noplay.js             |   27 +-
 dom/media/test/fragment_play.js               |  151 +-
 dom/media/test/gUM_support.js                 |   47 +-
 dom/media/test/manifest.js                    | 2271 +++++++----------
 .../test/marionette/yttest/debug_info.js      |   20 +-
 dom/media/test/marionette/yttest/force_hd.js  |   88 +-
 .../yttest/video_playback_quality.js          |    3 +-
 dom/media/test/play_promise.js                |    2 +-
 dom/media/test/seek_support.js                |   60 +-
 dom/media/test/test_access_control.html       |    6 +-
 .../test/test_autoplay_policy_activation.html |    2 +-
 ..._autoplay_policy_eventdown_activation.html |    4 +-
 .../test_autoplay_policy_key_blacklist.html   |    2 +-
 ...lay_policy_play_before_loadedmetadata.html |    4 +-
 .../test_autoplay_policy_unmute_pauses.html   |    4 +-
 ...lay_policy_web_audio_AudioParamStream.html |    3 +-
 ...icy_web_audio_createMediaStreamSource.html |    1 -
 ...web_audio_mediaElementAudioSourceNode.html |    1 -
 ...esumePageInvokedSuspendedAudioContext.html |    1 -
 ..._video_drawimage_with_suspended_video.html |    6 +-
 .../test/test_background_video_suspend.html   |    2 +-
 .../test_background_video_suspend_ends.html   |    2 +-
 ...ground_video_tainted_by_capturestream.html |    4 +-
 dom/media/test/test_buffered.html             |   16 +-
 dom/media/test/test_bug1248229.html           |    1 -
 .../test_bug1431810_opus_downmix_to_mono.html |    2 -
 dom/media/test/test_bug1512958.html           |    6 +-
 dom/media/test/test_bug463162.xhtml           |    4 +-
 dom/media/test/test_bug686942.html            |    2 +-
 dom/media/test/test_bug895305.html            |    1 -
 dom/media/test/test_can_play_type_mpeg.html   |    6 +-
 ...test_cloneElementVisually_ended_video.html |    2 -
 ...test_cloneElementVisually_mediastream.html |    2 -
 .../test_cloneElementVisually_no_suspend.html |    2 -
 .../test_cloneElementVisually_paused.html     |    2 -
 .../test_cloneElementVisually_poster.html     |    2 -
 ..._cloneElementVisually_resource_change.html |    2 -
 dom/media/test/test_clone_media_element.html  |   16 +-
 dom/media/test/test_cueless_webm_seek-1.html  |   10 +-
 dom/media/test/test_cueless_webm_seek-2.html  |    6 +-
 dom/media/test/test_cueless_webm_seek-3.html  |    8 +-
 dom/media/test/test_decoder_disable.html      |   14 +-
 dom/media/test/test_eme_autoplay.html         |    5 +-
 ...attach_same_mediakeys_during_playback.html |    1 -
 dom/media/test/test_eme_non_mse_fails.html    |    6 +-
 dom/media/test/test_eme_playback.html         |   19 +-
 dom/media/test/test_eme_pssh_in_moof.html     |    8 +-
 .../test/test_eme_request_notifications.html  |    1 +
 ...test_eme_stream_capture_blocked_case1.html |    3 +-
 ...test_eme_stream_capture_blocked_case2.html |    2 +-
 ...test_eme_stream_capture_blocked_case3.html |    2 +-
 .../test_eme_unsetMediaKeys_then_capture.html |    9 +-
 dom/media/test/test_eme_waitingforkey.html    |    1 -
 dom/media/test/test_fastSeek-forwards.html    |    2 +-
 dom/media/test/test_fastSeek.html             |    2 +-
 dom/media/test/test_fragment_noplay.html      |   30 +-
 dom/media/test/test_fragment_play.html        |   30 +-
 dom/media/test/test_info_leak.html            |   11 +-
 dom/media/test/test_load.html                 |   21 +-
 dom/media/test/test_load_same_resource.html   |    8 +-
 dom/media/test/test_media_selection.html      |    8 +-
 .../test/test_mediarecorder_bitrate.html      |    1 +
 ...test_mediarecorder_pause_resume_video.html |    3 +-
 ...est_mediarecorder_playback_can_repeat.html |    1 -
 ...mediarecorder_record_4ch_audiocontext.html |    5 +-
 ...ediarecorder_record_addtracked_stream.html |    4 +-
 ...est_mediarecorder_record_audiocontext.html |    4 +-
 ...arecorder_record_canvas_captureStream.html |    3 +-
 ...iarecorder_record_downsize_resolution.html |    1 -
 ...iarecorder_record_gum_video_timeslice.html |    4 +-
 ...rder_record_gum_video_timeslice_mixed.html |    6 +-
 .../test_mediarecorder_record_timeslice.html  |    2 +-
 ...ediarecorder_record_upsize_resolution.html |    1 -
 .../test/test_mediarecorder_reload_crash.html |    4 +-
 .../test_mediarecorder_state_transition.html  |    5 +-
 ...test_mediatrack_consuming_mediastream.html |   10 +
 .../test/test_mediatrack_replay_from_end.html |    2 +
 dom/media/test/test_metadata.html             |   11 +-
 .../test/test_midflight_redirect_blocked.html |   18 +-
 dom/media/test/test_play_twice.html           |   64 +-
 dom/media/test/test_playback.html             |   92 +-
 dom/media/test/test_playback_errors.html      |   28 +-
 dom/media/test/test_playback_hls.html         |   74 +-
 dom/media/test/test_playback_reactivate.html  |   42 +-
 dom/media/test/test_played.html               |   16 +-
 dom/media/test/test_preload_actions.html      |  126 +-
 dom/media/test/test_preload_suspend.html      |    6 +-
 dom/media/test/test_reset_events_async.html   |   10 +-
 dom/media/test/test_reset_src.html            |    3 +-
 dom/media/test/test_seamless_looping.html     |    2 -
 dom/media/test/test_seek-3.html               |    2 +
 dom/media/test/test_seek-6.html               |    3 +-
 dom/media/test/test_seek-7.html               |    1 +
 dom/media/test/test_seekToNextFrame.html      |   60 +-
 dom/media/test/test_seek_negative.html        |    4 +-
 dom/media/test/test_seekable1.html            |    4 +-
 dom/media/test/test_source.html               |    5 +-
 dom/media/test/test_standalone.html           |   10 +-
 .../test/test_streams_capture_origin.html     |    1 -
 .../test/test_streams_element_capture.html    |    4 +-
 .../test_streams_element_capture_reset.html   |   12 +-
 .../test_streams_element_capture_twice.html   |   12 +-
 dom/media/test/test_streams_firstframe.html   |    2 -
 dom/media/test/test_streams_tracks.html       |    1 +
 .../test_temporary_file_blob_video_plays.html |    3 +-
 dom/media/test/test_texttrackcue.html         |    3 +-
 .../test/test_texttrackevents_video.html      |    3 +-
 dom/media/test/test_texttracklist.html        |    4 +-
 .../test/test_timeupdate_small_files.html     |   18 +-
 dom/media/test/test_trackelementsrc.html      |    4 +-
 dom/media/test/test_trackevent.html           |    5 +-
 ...test_videoPlaybackQuality_totalFrames.html |    8 +-
 dom/media/test/test_volume.html               |    8 +-
 dom/media/test/test_vp9_superframes.html      |    2 +-
 dom/media/test/test_webvtt_positionalign.html |    2 +-
 127 files changed, 1891 insertions(+), 2389 deletions(-)

diff --git a/.eslintignore b/.eslintignore
index e183abefe829..c42d5279fc18 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -11,6 +11,10 @@
 # Exclude expected objdirs.
 obj*/
 
+# dom/ exclusions which should be removed (aka ESLint enabled)
+dom/media/test/
+!dom/media/test/marionette/yttest/*.js
+
 # build/ third-party code
 build/pgo/js-input/
 
@@ -155,8 +159,6 @@ dom/encoding/test/file_utf16_be_bom.js
 dom/encoding/test/file_utf16_le_bom.js
 
 # Not parsable
-dom/media/test/marionette/yttest/duration_test.js
-dom/media/test/marionette/yttest/until_end_test.js
 dom/tests/mochitest/general/test_focusrings.xul
 dom/html/test/test_bug677658.html
 
diff --git a/dom/media/test/AutoplayTestUtils.js b/dom/media/test/AutoplayTestUtils.js
index 5f34f15b61b8..125a3244390d 100644
--- a/dom/media/test/AutoplayTestUtils.js
+++ b/dom/media/test/AutoplayTestUtils.js
@@ -1,5 +1,3 @@
-/* import-globals-from manifest.js */
-
 function playAndPostResult(muted, parent_window) {
   let element = document.createElement("video");
   element.preload = "auto";
@@ -9,13 +7,13 @@ function playAndPostResult(muted, parent_window) {
   document.body.appendChild(element);
   let allowedToPlay = element.allowedToPlay;
   element.play().then(
-    () => {
-      parent_window.postMessage({ played: true, allowedToPlay }, "*");
-    },
-    () => {
-      parent_window.postMessage({ played: false, allowedToPlay }, "*");
-    }
-  );
+      () => {
+        parent_window.postMessage({played: true, allowedToPlay}, "*");
+      },
+      () => {
+        parent_window.postMessage({played: false, allowedToPlay}, "*");
+      }
+    );
 }
 
 function nextWindowMessage() {
@@ -32,15 +30,10 @@ const autoplayPermission = "autoplay-media";
 
 async function pushAutoplayAllowedPermission() {
   return new Promise((resolve, reject) => {
-    SpecialPowers.pushPermissions(
-      [
-        {
-          type: autoplayPermission,
-          allow: true,
-          context: document,
-        },
-      ],
-      resolve
-    );
+    SpecialPowers.pushPermissions([{
+      'type': autoplayPermission,
+      'allow': true,
+      'context': document
+    }], resolve);
   });
 }
diff --git a/dom/media/test/background_video.js b/dom/media/test/background_video.js
index 963aa1023bbc..66b36e58a9e8 100644
--- a/dom/media/test/background_video.js
+++ b/dom/media/test/background_video.js
@@ -1,35 +1,33 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-// This file expects manager to be defined in the global scope.
-/* global manager */
-/* import-globals-from manifest.js */
+/* jshint esversion: 6, -W097 */
+/* globals SimpleTest, SpecialPowers, document, info, is, manager, ok */
 
 "use strict";
 
 function startTest(test) {
   info(test.desc);
   SimpleTest.waitForExplicitFinish();
-  SpecialPowers.pushPrefEnv({ set: test.prefs }, () => {
+  SpecialPowers.pushPrefEnv({ 'set': test.prefs }, () => {
     manager.runTests(test.tests, test.runTest);
   });
 }
 
 function nextVideoEnded(video) {
-  return nextEvent(video, "ended");
+  return nextEvent(video, 'ended');
 }
 
 function nextVideoPlaying(video) {
-  return nextEvent(video, "playing");
+  return nextEvent(video, 'playing');
 }
 
 function nextVideoResumes(video) {
-  return nextEvent(video, "mozexitvideosuspend");
+  return nextEvent(video, 'mozexitvideosuspend');
 }
 
 function nextVideoSuspends(video) {
-  return nextEvent(video, "mozentervideosuspend");
+  return nextEvent(video, 'mozentervideosuspend');
 }
 
 /**
@@ -38,14 +36,10 @@ function nextVideoSuspends(video) {
  */
 function appendVideoToDoc(url, token, width, height) {
   // Default size of (160, 120) is used by other media tests.
-  if (width === undefined) {
-    width = 160;
-  }
-  if (height === undefined) {
-    height = (3 * width) / 4;
-  }
+  if (width === undefined) { width = 160; }
+  if (height === undefined) { height = 3 * width / 4; }
 
-  let v = document.createElement("video");
+  let v = document.createElement('video');
   v.token = token;
   v.width = width;
   v.height = height;
@@ -56,14 +50,10 @@ function appendVideoToDoc(url, token, width, height) {
 
 function appendVideoToDocWithoutLoad(token, width, height) {
   // Default size of (160, 120) is used by other media tests.
-  if (width === undefined) {
-    width = 160;
-  }
-  if (height === undefined) {
-    height = (3 * width) / 4;
-  }
+  if (width === undefined) { width = 160; }
+  if (height === undefined) { height = 3*width/4; }
 
-  let v = document.createElement("video");
+  let v = document.createElement('video');
   v.token = token;
   document.body.appendChild(v);
   v.width = width;
@@ -74,13 +64,7 @@ function appendVideoToDocWithoutLoad(token, width, height) {
 function loadAndWaitUntilLoadedmetadata(video, url, preloadType = "metadata") {
   return new Promise((resolve, reject) => {
     video.preload = preloadType;
-    video.addEventListener(
-      "loadedmetadata",
-      () => {
-        resolve();
-      },
-      true
-    );
+    video.addEventListener("loadedmetadata", () => { resolve(); }, true);
     video.src = url;
   });
 }
@@ -111,9 +95,7 @@ function waitUntilVisible(video) {
  * @returns {Promise} Promise that is resolved when video 'playing' event fires.
  */
 function waitUntilPlaying(video) {
-  var p = once(video, "playing", () => {
-    ok(true, `${video.token} played.`);
-  });
+  var p = once(video, 'playing', () => { ok(true, `${video.token} played.`); });
   Log(video.token, "Start playing");
   video.play();
   return p;
@@ -130,9 +112,7 @@ function waitUntilEnded(video) {
     return Promise.resolve();
   }
 
-  return once(video, "ended", () => {
-    ok(true, `${video.token} ended`);
-  });
+  return once(video, 'ended', () => { ok(true, `${video.token} ended`); });
 }
 
 /**
@@ -141,10 +121,10 @@ function waitUntilEnded(video) {
  *                    suspend timer.
  */
 function testSuspendTimerStartedWhenHidden(video) {
-  var p = once(video, "mozstartvideosuspendtimer").then(() => {
-    ok(true, `${video.token} suspend begins`);
+  var p = once(video, 'mozstartvideosuspendtimer').then(() => {
+    ok(true, `${video.token} suspend begins`)
   });
-  Log(video.token, "Set Hidden");
+  Log(video.token, 'Set Hidden');
   video.setVisible(false);
   return p;
 }
@@ -154,7 +134,7 @@ function testSuspendTimerStartedWhenHidden(video) {
  * @returns {Promise} Promise that is resolved when video decode suspends.
  */
 function testVideoSuspendsWhenHidden(video) {
-  let p = once(video, "mozentervideosuspend").then(() => {
+  let p = once(video, 'mozentervideosuspend').then(() => {
     ok(true, `${video.token} suspends`);
   });
   Log(video.token, "Set hidden");
@@ -167,7 +147,7 @@ function testVideoSuspendsWhenHidden(video) {
  * @returns {Promise} Promise that is resolved when video decode resumes.
  */
 function testVideoResumesWhenShown(video) {
-  var p = once(video, "mozexitvideosuspend").then(() => {
+  var p = once(video, 'mozexitvideosuspend').then(() => {
     ok(true, `${video.token} resumes`);
   });
   Log(video.token, "Set visible");
@@ -180,7 +160,7 @@ function testVideoResumesWhenShown(video) {
  * @returns {Promise} Promise that is resolved when video decode resumes.
  */
 function testVideoOnlySeekCompletedWhenShown(video) {
-  var p = once(video, "mozvideoonlyseekcompleted").then(() => {
+  var p = once(video, 'mozvideoonlyseekcompleted').then(() => {
     ok(true, `${video.token} resumes`);
   });
   Log(video.token, "Set visible");
@@ -194,12 +174,8 @@ function testVideoOnlySeekCompletedWhenShown(video) {
  */
 function checkVideoDoesntSuspend(video) {
   let p = Promise.race([
-    waitUntilEnded(video).then(() => {
-      ok(true, `${video.token} ended before decode was suspended`);
-    }),
-    once(video, "mozentervideosuspend", () => {
-      Promise.reject(new Error(`${video.token} suspended`));
-    }),
+    waitUntilEnded(video).then(() => { ok(true, `${video.token} ended before decode was suspended`) }),
+    once(video, 'mozentervideosuspend', () => { Promise.reject(new Error(`${video.token} suspended`)) })
   ]);
   Log(video.token, "Set hidden.");
   video.setVisible(false);
@@ -214,7 +190,7 @@ function checkVideoDoesntSuspend(video) {
 function waitTil(video, time) {
   Log(video.token, `Waiting for time to reach ${time}s`);
   return new Promise(resolve => {
-    video.addEventListener("timeupdate", function timeUpdateEvent() {
+    video.addEventListener('timeupdate', function timeUpdateEvent() {
       if (video.currentTime > time) {
         video.removeEventListener(name, timeUpdateEvent);
         resolve();
diff --git a/dom/media/test/can_play_type_dash.js b/dom/media/test/can_play_type_dash.js
index b4760545db7a..ec5764be23dd 100644
--- a/dom/media/test/can_play_type_dash.js
+++ b/dom/media/test/can_play_type_dash.js
@@ -11,10 +11,10 @@ function check_dash(v, enabled) {
   check("application/dash+xml; codecs=vorbis", "probably");
   check("application/dash+xml; codecs=vorbis,vp8", "probably");
   check("application/dash+xml; codecs=vorbis,vp8.0", "probably");
-  check('application/dash+xml; codecs="vorbis,vp8"', "probably");
-  check('application/dash+xml; codecs="vorbis,vp8.0"', "probably");
-  check('application/dash+xml; codecs="vp8, vorbis"', "probably");
-  check('application/dash+xml; codecs="vp8.0, vorbis"', "probably");
+  check("application/dash+xml; codecs=\"vorbis,vp8\"", "probably");
+  check("application/dash+xml; codecs=\"vorbis,vp8.0\"", "probably");
+  check("application/dash+xml; codecs=\"vp8, vorbis\"", "probably");
+  check("application/dash+xml; codecs=\"vp8.0, vorbis\"", "probably");
   check("application/dash+xml; codecs=vp8", "probably");
   check("application/dash+xml; codecs=vp8.0", "probably");
 
diff --git a/dom/media/test/can_play_type_ogg.js b/dom/media/test/can_play_type_ogg.js
index c03f8b2d3efd..8f03b96aeb5e 100644
--- a/dom/media/test/can_play_type_ogg.js
+++ b/dom/media/test/can_play_type_ogg.js
@@ -1,3 +1,4 @@
+
 function check_ogg(v, enabled, finish) {
   function check(type, expected) {
     is(v.canPlayType(type), enabled ? expected : "", type);
@@ -14,7 +15,7 @@ function check_ogg(v, enabled, finish) {
       check("audio/ogg; codecs=vorbis", "probably");
       check("video/ogg; codecs=vorbis", "probably");
       check("video/ogg; codecs=vorbis,theora", "probably");
-      check('video/ogg; codecs="vorbis, theora"', "probably");
+      check("video/ogg; codecs=\"vorbis, theora\"", "probably");
       check("video/ogg; codecs=theora", "probably");
 
       resolve();
@@ -24,35 +25,33 @@ function check_ogg(v, enabled, finish) {
   // Verify Opus support
   function verify_opus_support() {
     return new Promise(function(resolve, reject) {
-      var OpusEnabled = SpecialPowers.getBoolPref(
-        "media.opus.enabled",
-        undefined
-      );
+      var OpusEnabled = undefined;
+      try {
+        OpusEnabled = SpecialPowers.getBoolPref("media.opus.enabled");
+      } catch (ex) {
+        // SpecialPowers failed, perhaps because Opus isn't compiled in
+        console.log("media.opus.enabled pref not found; skipping Opus validation");
+      }
       if (OpusEnabled != undefined) {
         resolve();
       } else {
-        console.log(
-          "media.opus.enabled pref not found; skipping Opus validation"
-        );
         reject();
       }
     });
   }
 
   function opus_enable() {
-    return SpecialPowers.pushPrefEnv({
-      set: [["media.opus.enabled", true]],
-    }).then(function() {
-      check("audio/ogg; codecs=opus", "probably");
-    });
+    return SpecialPowers.pushPrefEnv({"set": [['media.opus.enabled', true]]})
+           .then(function() {
+             check("audio/ogg; codecs=opus", "probably");
+           });
   }
 
   function opus_disable() {
-    return SpecialPowers.pushPrefEnv({
-      set: [["media.opus.enabled", false]],
-    }).then(function() {
-      check("audio/ogg; codecs=opus", "");
-    });
+    return SpecialPowers.pushPrefEnv({"set": [['media.opus.enabled', false]]})
+           .then(function() {
+             check("audio/ogg; codecs=opus", "");
+           });
   }
 
   function unspported_ogg() {
@@ -65,8 +64,9 @@ function check_ogg(v, enabled, finish) {
   }
 
   basic_test()
-    .then(verify_opus_support)
-    .then(opus_enable)
-    .then(opus_disable)
-    .then(unspported_ogg, unspported_ogg);
+  .then(verify_opus_support)
+  .then(opus_enable)
+  .then(opus_disable)
+  .then(unspported_ogg, unspported_ogg);
+
 }
diff --git a/dom/media/test/can_play_type_wave.js b/dom/media/test/can_play_type_wave.js
index 9c76eebbe109..4a2a48f42b42 100644
--- a/dom/media/test/can_play_type_wave.js
+++ b/dom/media/test/can_play_type_wave.js
@@ -15,15 +15,15 @@ function check_wave(v, enabled) {
   check("audio/wave; codecs=7", "probably");
   // "no codecs" should be supported, I guess
   check("audio/wave; codecs=", "maybe");
-  check('audio/wave; codecs=""', "maybe");
+  check("audio/wave; codecs=\"\"", "maybe");
 
   // Unsupported Wave codecs
   check("audio/wave; codecs=0", "");
   check("audio/wave; codecs=2", "");
   check("audio/wave; codecs=xyz,1", "");
   check("audio/wave; codecs=1,xyz", "");
-  check('audio/wave; codecs="xyz, 1"', "");
+  check("audio/wave; codecs=\"xyz, 1\"", "");
   // empty codec names
   check("audio/wave; codecs=,", "");
-  check('audio/wave; codecs="0, 1,"', "");
+  check("audio/wave; codecs=\"0, 1,\"", "");
 }
diff --git a/dom/media/test/can_play_type_webm.js b/dom/media/test/can_play_type_webm.js
index ee57da66c6e2..8965ce63ce54 100644
--- a/dom/media/test/can_play_type_webm.js
+++ b/dom/media/test/can_play_type_webm.js
@@ -1,18 +1,14 @@
 async function check_webm(v, enabled) {
   function check(type, expected) {
-    is(
-      v.canPlayType(type),
-      enabled ? expected : "",
-      type + "='" + expected + "'"
-    );
+    is(v.canPlayType(type), enabled ? expected : "", type + "='" + expected + "'");
   }
 
   // WebM types
   check("video/webm", "maybe");
   check("audio/webm", "maybe");
 
-  var video = ["vp8", "vp8.0", "vp9", "vp9.0"];
-  var audio = ["vorbis", "opus"];
+  var video = ['vp8', 'vp8.0', 'vp9', 'vp9.0'];
+  var audio = ['vorbis', 'opus'];
 
   audio.forEach(function(acodec) {
     check("audio/webm; codecs=" + acodec, "probably");
@@ -21,8 +17,8 @@ async function check_webm(v, enabled) {
   video.forEach(function(vcodec) {
     check("video/webm; codecs=" + vcodec, "probably");
     audio.forEach(function(acodec) {
-      check('video/webm; codecs="' + vcodec + ", " + acodec + '"', "probably");
-      check('video/webm; codecs="' + acodec + ", " + vcodec + '"', "probably");
+        check("video/webm; codecs=\"" + vcodec + ", " + acodec + "\"", "probably");
+        check("video/webm; codecs=\"" + acodec + ", " + vcodec + "\"", "probably");
     });
   });
 
@@ -31,9 +27,17 @@ async function check_webm(v, enabled) {
   check("video/webm; codecs=xyz,vorbis", "");
   check("video/webm; codecs=vorbis,xyz", "");
 
-  await SpecialPowers.pushPrefEnv({ set: [["media.av1.enabled", true]] });
-  check('video/webm; codecs="av1"', "probably");
+  function getPref(name) {
+    var pref = false;
+    try {
+      pref = SpecialPowers.getBoolPref(name);
+    } catch(ex) { }
+    return pref;
+  }
 
-  await SpecialPowers.pushPrefEnv({ set: [["media.av1.enabled", false]] });
-  check('video/webm; codecs="av1"', "");
+  await SpecialPowers.pushPrefEnv({"set": [["media.av1.enabled", true]]});
+  check("video/webm; codecs=\"av1\"", "probably");
+
+  await SpecialPowers.pushPrefEnv({"set": [["media.av1.enabled", false]]});
+  check("video/webm; codecs=\"av1\"", "");
 }
diff --git a/dom/media/test/chromeHelper.js b/dom/media/test/chromeHelper.js
index ff83660fe2f7..cac77d51d5cb 100644
--- a/dom/media/test/chromeHelper.js
+++ b/dom/media/test/chromeHelper.js
@@ -4,20 +4,16 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-/* eslint-env mozilla/frame-script */
-
 "use strict";
 
-// eslint-disable-next-line mozilla/use-services
-const dirSvc = Cc["@mozilla.org/file/directory_service;1"].getService(
-  Ci.nsIProperties
-);
+const dirSvc = Cc["@mozilla.org/file/directory_service;1"].
+               getService(Ci.nsIProperties);
 
-addMessageListener("media-test:getcwd", () => {
+addMessageListener('media-test:getcwd', () => {
   let cwd;
   try {
     cwd = dirSvc.get("CurWorkD", Ci.nsIFile).path;
   } finally {
-    sendAsyncMessage("media-test:cwd", cwd);
+    sendAsyncMessage('media-test:cwd', cwd);
   }
 });
diff --git a/dom/media/test/cloneElementVisually_helpers.js b/dom/media/test/cloneElementVisually_helpers.js
index ab81aad9ed67..77cffc499de5 100644
--- a/dom/media/test/cloneElementVisually_helpers.js
+++ b/dom/media/test/cloneElementVisually_helpers.js
@@ -1,7 +1,5 @@
-const TEST_VIDEO_1 =
-  "http://mochi.test:8888/tests/dom/media/test/bipbop_225w_175kbps.mp4";
-const TEST_VIDEO_2 =
-  "http://mochi.test:8888/tests/dom/media/test/pixel_aspect_ratio.mp4";
+const TEST_VIDEO_1 = "http://mochi.test:8888/tests/dom/media/test/bipbop_225w_175kbps.mp4";
+const TEST_VIDEO_2 = "http://mochi.test:8888/tests/dom/media/test/pixel_aspect_ratio.mp4";
 const LONG_VIDEO = "http://mochi.test:8888/tests/dom/media/test/gizmo.mp4";
 
 /**
@@ -11,11 +9,11 @@ const LONG_VIDEO = "http://mochi.test:8888/tests/dom/media/test/gizmo.mp4";
 async function setup() {
   await SpecialPowers.pushPrefEnv({
     set: [
-      ["media.test.video-suspend", true],
-      ["media.suspend-bkgnd-video.enabled", true],
-      ["media.suspend-bkgnd-video.delay-ms", 500],
-      ["media.dormant-on-pause-timeout-ms", 0],
-      ["media.cloneElementVisually.testing", true],
+      [ "media.test.video-suspend", true ],
+      [ "media.suspend-bkgnd-video.enabled", true ],
+      [ "media.suspend-bkgnd-video.delay-ms", 500 ],
+      [ "media.dormant-on-pause-timeout-ms", 0 ],
+      [ "media.cloneElementVisually.testing", true ],
     ],
   });
 
@@ -91,19 +89,11 @@ async function assertVideosMatch(video1, video2) {
   let video2Frame = captureFrameImageData(video2);
 
   let left = document.getElementById("left");
-  let leftCtx = getWrappedScaledCanvasContext(
-    left,
-    video1Frame.width,
-    video1Frame.height
-  );
+  let leftCtx = getWrappedScaledCanvasContext(left, video1Frame.width, video1Frame.height);
   leftCtx.putImageData(video1Frame, 0, 0);
 
   let right = document.getElementById("right");
-  let rightCtx = getWrappedScaledCanvasContext(
-    right,
-    video2Frame.width,
-    video2Frame.height
-  );
+  let rightCtx = getWrappedScaledCanvasContext(right, video2Frame.width, video2Frame.height);
   rightCtx.putImageData(video2Frame, 0, 0);
 
   if (video1Frame.data.length != video2Frame.data.length) {
@@ -220,7 +210,7 @@ async function ensureVideoSuspendable(video) {
   video.setVisible(false);
   await suspendPromise;
   ok(true, "Suspended after the video was made invisible.");
-  video.setVisible(true);
+  video.setVisible(true)
 
   ok(!video.hasSuspendTaint(), "Should still be suspendable.");
 
@@ -230,3 +220,5 @@ async function ensureVideoSuspendable(video) {
   ok(true, "Shutdown decoder after the video was paused.");
   await video.play();
 }
+
+
diff --git a/dom/media/test/eme.js b/dom/media/test/eme.js
index 4fac0440b372..5a062800de76 100644
--- a/dom/media/test/eme.js
+++ b/dom/media/test/eme.js
@@ -1,14 +1,10 @@
-/* import-globals-from manifest.js */
-
 const CLEARKEY_KEYSYSTEM = "org.w3.clearkey";
 
-const gCencMediaKeySystemConfig = [
-  {
-    initDataTypes: ["cenc"],
-    videoCapabilities: [{ contentType: "video/mp4" }],
-    audioCapabilities: [{ contentType: "audio/mp4" }],
-  },
-];
+const gCencMediaKeySystemConfig = [{
+  initDataTypes: ['cenc'],
+  videoCapabilities: [{ contentType: 'video/mp4' }],
+  audioCapabilities: [{ contentType: 'audio/mp4' }],
+}];
 
 function IsMacOSSnowLeopardOrEarlier() {
   var re = /Mac OS X (\d+)\.(\d+)/;
@@ -21,21 +17,23 @@ function IsMacOSSnowLeopardOrEarlier() {
   return major == 10 && minor <= 6;
 }
 
-function bail(message) {
+function bail(message)
+{
   return function(err) {
     if (err) {
-      message += "; " + String(err);
+      message +=  "; " + String(err)
     }
     ok(false, message);
     if (err) {
       info(String(err));
     }
     SimpleTest.finish();
-  };
+  }
 }
 
-function ArrayBufferToString(arr) {
-  var str = "";
+function ArrayBufferToString(arr)
+{
+  var str = '';
   var view = new Uint8Array(arr);
   for (var i = 0; i < view.length; i++) {
     str += String.fromCharCode(view[i]);
@@ -43,7 +41,8 @@ function ArrayBufferToString(arr) {
   return str;
 }
 
-function StringToArrayBuffer(str) {
+function StringToArrayBuffer(str)
+{
   var arr = new ArrayBuffer(str.length);
   var view = new Uint8Array(arr);
   for (var i = 0; i < str.length; i++) {
@@ -52,15 +51,16 @@ function StringToArrayBuffer(str) {
   return arr;
 }
 
-function StringToHex(str) {
+function StringToHex(str){
   var res = "";
   for (var i = 0; i < str.length; ++i) {
-    res += ("0" + str.charCodeAt(i).toString(16)).slice(-2);
+      res += ("0" + str.charCodeAt(i).toString(16)).slice(-2);
   }
   return res;
 }
 
-function Base64ToHex(str) {
+function Base64ToHex(str)
+{
   var bin = window.atob(str.replace(/-/g, "+").replace(/_/g, "/"));
   var res = "";
   for (var i = 0; i < bin.length; i++) {
@@ -69,56 +69,46 @@ function Base64ToHex(str) {
   return res;
 }
 
-function HexToBase64(hex) {
+function HexToBase64(hex)
+{
   var bin = "";
   for (var i = 0; i < hex.length; i += 2) {
     bin += String.fromCharCode(parseInt(hex.substr(i, 2), 16));
   }
-  return window
-    .btoa(bin)
-    .replace(/=/g, "")
-    .replace(/\+/g, "-")
-    .replace(/\//g, "_");
+  return window.btoa(bin).replace(/=/g, "").replace(/\+/g, "-").replace(/\//g, "_");
 }
 
-function TimeRangesToString(trs) {
+function TimeRangesToString(trs)
+{
   var l = trs.length;
-  if (l === 0) {
-    return "-";
-  }
+  if (l === 0) { return "-"; }
   var s = "";
   var i = 0;
   for (;;) {
     s += trs.start(i) + "-" + trs.end(i);
-    if (++i === l) {
-      return s;
-    }
+    if (++i === l) { return s; }
     s += ",";
   }
 }
 
-function SourceBufferToString(sb) {
-  return (
-    "SourceBuffer{" +
-    "AppendMode=" +
-    (sb.AppendMode || "-") +
-    ", updating=" +
-    (sb.updating ? "true" : "false") +
-    ", buffered=" +
-    TimeRangesToString(sb.buffered) +
-    ", audioTracks=" +
-    (sb.audioTracks ? sb.audioTracks.length : "-") +
-    ", videoTracks=" +
-    (sb.videoTracks ? sb.videoTracks.length : "-") +
-    "}"
-  );
+function SourceBufferToString(sb)
+{
+  return ("SourceBuffer{"
+    + "AppendMode=" + (sb.AppendMode || "-")
+    + ", updating=" + (sb.updating ? "true" : "false")
+    + ", buffered=" + TimeRangesToString(sb.buffered)
+    + ", audioTracks=" + (sb.audioTracks ? sb.audioTracks.length : "-")
+    + ", videoTracks=" + (sb.videoTracks ? sb.videoTracks.length : "-")
+    + "}");
 }
 
-function SourceBufferListToString(sbl) {
+function SourceBufferListToString(sbl)
+{
   return "SourceBufferList[" + sbl.map(SourceBufferToString).join(", ") + "]";
 }
 
-function GenerateClearKeyLicense(licenseRequest, keyStore) {
+function GenerateClearKeyLicense(licenseRequest, keyStore)
+{
   var msgStr = ArrayBufferToString(licenseRequest);
   var msg = JSON.parse(msgStr);
 
@@ -130,51 +120,47 @@ function GenerateClearKeyLicense(licenseRequest, keyStore) {
 
     if (key) {
       keys.push({
-        kty: "oct",
-        kid: id64,
-        k: HexToBase64(key),
+        "kty": "oct",
+        "kid": id64,
+        "k": HexToBase64(key)
       });
     }
   }
 
-  return new TextEncoder().encode(
-    JSON.stringify({
-      keys,
-      type: msg.type || "temporary",
-    })
-  );
+  return new TextEncoder().encode(JSON.stringify({
+    "keys" : keys,
+    "type" : msg.type || "temporary"
+  }));
 }
 
 function UpdateSessionFunc(test, token, sessionType, resolve, reject) {
   return function(ev) {
     var license = GenerateClearKeyLicense(ev.message, test.keys);
-    Log(
-      token,
-      "sending update message to CDM: " + new TextDecoder().decode(license)
-    );
-    ev.target
-      .update(license)
-      .then(function() {
-        Log(token, "MediaKeySession update ok!");
-        resolve(ev.target);
-      })
-      .catch(function(reason) {
-        reject(`${token} MediaKeySession update failed: ${reason}`);
-      });
-  };
+    Log(token, "sending update message to CDM: " + (new TextDecoder().decode(license)));
+    ev.target.update(license).then(function() {
+      Log(token, "MediaKeySession update ok!");
+      resolve(ev.target);
+    }).catch(function(reason) {
+      reject(`${token} MediaKeySession update failed: ${reason}`);
+    });
+  }
 }
 
-function MaybeCrossOriginURI(test, uri) {
+function MaybeCrossOriginURI(test, uri)
+{
   if (test.crossOrigin) {
     return "https://example.com:443/tests/dom/media/test/allowed.sjs?" + uri;
+  } else {
+    return uri;
   }
-  return uri;
 }
 
-function AppendTrack(test, ms, track, token) {
+function AppendTrack(test, ms, track, token)
+{
   return new Promise(function(resolve, reject) {
     var sb;
     var curFragment = 0;
+    var resolved = false;
     var fragments = track.fragments;
     var fragmentFile;
 
@@ -182,6 +168,7 @@ function AppendTrack(test, ms, track, token) {
       if (curFragment >= fragments.length) {
         Log(token, track.name + ": end of track");
         resolve();
+        resolved = true;
         return;
       }
 
@@ -192,10 +179,7 @@ function AppendTrack(test, ms, track, token) {
       req.responseType = "arraybuffer";
 
       req.addEventListener("load", function() {
-        Log(
-          token,
-          track.name + ": fetch of " + fragmentFile + " complete, appending"
-        );
+        Log(token, track.name + ": fetch of " + fragmentFile + " complete, appending");
         sb.appendBuffer(new Uint8Array(req.response));
       });
 
@@ -206,26 +190,14 @@ function AppendTrack(test, ms, track, token) {
         reject(`${token} - ${track.name}: aborted fetching ${fragmentFile}`);
       });
 
-      Log(
-        token,
-        track.name +
-          ": addNextFragment() fetching next fragment " +
-          fragmentFile
-      );
+      Log(token, track.name + ": addNextFragment() fetching next fragment " + fragmentFile);
       req.send(null);
     }
 
     Log(token, track.name + ": addSourceBuffer(" + track.type + ")");
     sb = ms.addSourceBuffer(track.type);
     sb.addEventListener("updateend", function() {
-      Log(
-        token,
-        track.name +
-          ": updateend for " +
-          fragmentFile +
-          ", " +
-          SourceBufferToString(sb)
-      );
+      Log(token, track.name + ": updateend for " + fragmentFile + ", " + SourceBufferToString(sb));
       addNextFragment();
     });
 
@@ -235,7 +207,8 @@ function AppendTrack(test, ms, track, token) {
 
 //Returns a promise that is resolved when the media element is ready to have
 //its play() function called; when it's loaded MSE fragments.
-function LoadTest(test, elem, token, endOfStream = true) {
+function LoadTest(test, elem, token, endOfStream = true)
+{
   if (!test.tracks) {
     ok(false, token + " test does not have a tracks list");
     return Promise.reject();
@@ -245,27 +218,19 @@ function LoadTest(test, elem, token, endOfStream = true) {
   elem.src = URL.createObjectURL(ms);
   elem.crossOrigin = test.crossOrigin || false;
 
-  return new Promise(function(resolve, reject) {
-    ms.addEventListener(
-      "sourceopen",
-      function() {
-        Log(token, "sourceopen");
-        Promise.all(
-          test.tracks.map(function(track) {
-            return AppendTrack(test, ms, track, token);
-          })
-        )
-          .then(function() {
-            Log(token, "Tracks loaded, calling MediaSource.endOfStream()");
-            if (endOfStream) {
-              ms.endOfStream();
-            }
-            resolve();
-          })
-          .catch(reject);
-      },
-      { once: true }
-    );
+  return new Promise(function (resolve, reject) {
+    ms.addEventListener("sourceopen", function () {
+      Log(token, "sourceopen");
+      Promise.all(test.tracks.map(function(track) {
+        return AppendTrack(test, ms, track, token);
+      })).then(function() {
+        Log(token, "Tracks loaded, calling MediaSource.endOfStream()");
+        if (endOfStream) {
+          ms.endOfStream();
+        }
+        resolve();
+      }).catch(reject);
+    }, {once: true});
   });
 }
 
@@ -283,7 +248,7 @@ function EMEPromise() {
  * or will be rejected with a string that describes the failure.
  */
 function CreateMediaKeys(v, test, token) {
-  let p = new EMEPromise();
+  let p = new EMEPromise;
 
   function streamType(type) {
     var x = test.tracks.find(o => o.name == type);
@@ -293,24 +258,21 @@ function CreateMediaKeys(v, test, token) {
   function onencrypted(ev) {
     var options = { initDataTypes: [ev.initDataType] };
     if (streamType("video")) {
-      options.videoCapabilities = [{ contentType: streamType("video") }];
+      options.videoCapabilities = [{contentType: streamType("video")}];
     }
     if (streamType("audio")) {
-      options.audioCapabilities = [{ contentType: streamType("audio") }];
+      options.audioCapabilities = [{contentType: streamType("audio")}];
     }
-    navigator.requestMediaKeySystemAccess(CLEARKEY_KEYSYSTEM, [options]).then(
-      keySystemAccess => {
-        keySystemAccess
-          .createMediaKeys()
-          .then(p.resolve, () =>
-            p.reject(`${token} Failed to create MediaKeys object.`)
-          );
-      },
-      () => p.reject(`${token} Failed to request key system access.`)
-    );
+    navigator.requestMediaKeySystemAccess(CLEARKEY_KEYSYSTEM, [options])
+    .then(keySystemAccess => {
+      keySystemAccess.createMediaKeys().then(
+        p.resolve,
+        () => p.reject(`${token} Failed to create MediaKeys object.`)
+      );
+    }, () => p.reject(`${token} Failed to request key system access.`));
   }
 
-  v.addEventListener("encrypted", onencrypted, { once: true });
+  v.addEventListener("encrypted", onencrypted, {once: true});
   return p.promise;
 }
 
@@ -320,13 +282,14 @@ function CreateMediaKeys(v, test, token) {
  * with a string that describes the failure.
  */
 function CreateAndSetMediaKeys(v, test, token) {
-  let p = new EMEPromise();
+  let p = new EMEPromise;
 
   CreateMediaKeys(v, test, token).then(mediaKeys => {
-    v.setMediaKeys(mediaKeys).then(p.resolve, () =>
-      p.reject(`${token} Failed to set MediaKeys on <video> element.`)
+    v.setMediaKeys(mediaKeys).then(
+      p.resolve,
+      () => p.reject(`${token} Failed to set MediaKeys on <video> element.`)
     );
-  }, p.reject);
+  }, p.reject)
 
   return p.promise;
 }
@@ -337,25 +300,18 @@ function CreateAndSetMediaKeys(v, test, token) {
  * is completed (specified by test.sessionCount).
  */
 function LoadInitData(v, test, token) {
-  let p = new EMEPromise();
+  let p = new EMEPromise;
   let initDataQueue = [];
 
   // Call SimpleTest._originalSetTimeout() to bypass the flaky timeout checker.
-  let timer = SimpleTest._originalSetTimeout.call(
-    window,
-    () => {
-      p.reject(`${token} Timed out in waiting for the init data.`);
-    },
-    60000
-  );
+  let timer = SimpleTest._originalSetTimeout.call(window, () => {
+    p.reject(`${token} Timed out in waiting for the init data.`);
+  }, 60000);
 
   function onencrypted(ev) {
     initDataQueue.push(ev);
-    Log(
-      token,
-      `got encrypted(${ev.initDataType}, ` +
-        `${StringToHex(ArrayBufferToString(ev.initData))}) event.`
-    );
+    Log(token, `got encrypted(${ev.initDataType}, ` +
+        `${StringToHex(ArrayBufferToString(ev.initData))}) event.`);
     if (test.sessionCount == initDataQueue.length) {
       p.resolve(initDataQueue);
       clearTimeout(timer);
@@ -373,18 +329,16 @@ function LoadInitData(v, test, token) {
  */
 function MakeRequest(test, token, ev, session, sessionType) {
   sessionType = sessionType || "temporary";
-  let p = new EMEPromise();
-  let str =
-    `session[${session.sessionId}].generateRequest(` +
+  let p = new EMEPromise;
+  let str = `session[${session.sessionId}].generateRequest(` +
     `${ev.initDataType}, ${StringToHex(ArrayBufferToString(ev.initData))})`;
 
-  session.addEventListener(
-    "message",
-    UpdateSessionFunc(test, token, sessionType, p.resolve, p.reject)
-  );
+  session.addEventListener("message",
+    UpdateSessionFunc(test, token, sessionType, p.resolve, p.reject));
 
   Log(token, str);
-  session.generateRequest(ev.initDataType, ev.initData).catch(reason => {
+  session.generateRequest(ev.initDataType, ev.initData)
+  .catch(reason => {
     // Reject the promise if generateRequest() failed.
     // Otherwise it will be resolved in UpdateSessionFunc().
     p.reject(`${token}: ${str} failed; ${reason}`);
@@ -421,7 +375,8 @@ function CleanUpMedia(v) {
  * Close all sessions and clean up the |v| element.
  */
 function CloseSessions(v, sessions) {
-  return Promise.all(sessions.map(s => s.close())).then(CleanUpMedia(v));
+  return Promise.all(sessions.map(s => s.close()))
+  .then(CleanUpMedia(v));
 }
 
 /*
@@ -430,41 +385,38 @@ function CloseSessions(v, sessions) {
  * if any failure.
  */
 function SetupEME(v, test, token) {
-  let p = new EMEPromise();
+  let p = new EMEPromise;
 
   v.onerror = function() {
     p.reject(`${token} got an error event.`);
-  };
+  }
 
   Promise.all([
     LoadInitData(v, test, token),
     CreateAndSetMediaKeys(v, test, token),
-    LoadTest(test, v, token),
-  ])
-    .then(values => {
-      let initData = values[0];
-      return ProcessInitData(v, test, token, initData);
-    })
-    .then(p.resolve, p.reject);
+    LoadTest(test, v, token)])
+  .then(values => {
+    let initData = values[0];
+    return ProcessInitData(v, test, token, initData);
+  })
+  .then(p.resolve, p.reject);
 
   return p.promise;
 }
 
 function SetupEMEPref(callback) {
   var prefs = [
-    ["media.mediasource.enabled", true],
-    ["media.mediasource.webm.enabled", true],
+    [ "media.mediasource.enabled", true ],
+    [ "media.mediasource.webm.enabled", true ],
   ];
 
-  if (
-    SpecialPowers.Services.appinfo.name == "B2G" ||
-    !manifestVideo().canPlayType("video/mp4")
-  ) {
+  if (SpecialPowers.Services.appinfo.name == "B2G" ||
+      !manifestVideo().canPlayType("video/mp4")) {
     // XXX remove once we have mp4 PlatformDecoderModules on all platforms.
-    prefs.push(["media.use-blank-decoder", true]);
+    prefs.push([ "media.use-blank-decoder", true ]);
   }
 
-  SpecialPowers.pushPrefEnv({ set: prefs }, callback);
+  SpecialPowers.pushPrefEnv({ "set" : prefs }, callback);
 }
 
 function fetchWithXHR(uri, onLoadFunction) {
@@ -472,12 +424,8 @@ function fetchWithXHR(uri, onLoadFunction) {
     var xhr = new XMLHttpRequest();
     xhr.open("GET", uri, true);
     xhr.responseType = "arraybuffer";
-    xhr.addEventListener("load", function() {
-      is(
-        xhr.status,
-        200,
-        "fetchWithXHR load uri='" + uri + "' status=" + xhr.status
-      );
+    xhr.addEventListener("load", function () {
+      is(xhr.status, 200, "fetchWithXHR load uri='" + uri + "' status=" + xhr.status);
       resolve(xhr.response);
     });
     xhr.send();
@@ -488,17 +436,13 @@ function fetchWithXHR(uri, onLoadFunction) {
   }
 
   return p;
-}
+};
 
 function once(target, name, cb) {
   var p = new Promise(function(resolve, reject) {
-    target.addEventListener(
-      name,
-      function(arg) {
-        resolve(arg);
-      },
-      { once: true }
-    );
+    target.addEventListener(name, function(arg) {
+      resolve(arg);
+    }, {once: true});
   });
   if (cb) {
     p.then(cb);
diff --git a/dom/media/test/file_autoplay_policy_activation_frame.html b/dom/media/test/file_autoplay_policy_activation_frame.html
index 104db724035d..7294e8924e75 100644
--- a/dom/media/test/file_autoplay_policy_activation_frame.html
+++ b/dom/media/test/file_autoplay_policy_activation_frame.html
@@ -23,7 +23,7 @@
           } else if (event.data == "play-muted") {
             playAndPostResult(true, event.source);
           }
-        });
+        }, false);
       let w = window.opener || window.parent;
       w.postMessage("ready", "*");
     </script>
diff --git a/dom/media/test/file_autoplay_policy_eventdown_activation.html b/dom/media/test/file_autoplay_policy_eventdown_activation.html
index e25b6401d1e3..ca49e22af7bb 100644
--- a/dom/media/test/file_autoplay_policy_eventdown_activation.html
+++ b/dom/media/test/file_autoplay_policy_eventdown_activation.html
@@ -36,12 +36,12 @@
 
           let x = eventNames.map(
             (eventName) => {
-              return new Promise(function (resolve, reject) {
+              return new Promise(async function (resolve, reject) {
                 window.addEventListener(eventName, async function (event) {
-                  let p = await element.play().then(() => true, () => false);
-                  ok(p, "Expect to be activated already in " + eventName);
+                  let played = await element.play().then(() => true, () => false);
+                  ok(played, "Expect to be activated already in " + eventName);
                   resolve();
-                });
+                }, false);
               });
             });
 
diff --git a/dom/media/test/fragment_noplay.js b/dom/media/test/fragment_noplay.js
index 247641763f09..19a032a28868 100644
--- a/dom/media/test/fragment_noplay.js
+++ b/dom/media/test/fragment_noplay.js
@@ -1,19 +1,14 @@
 function test_fragment_noplay(v, start, end, is, ok, finish) {
-  function onLoadedMetadata() {
-    var s = start == null ? 0 : start;
-    var e = end == null ? v.duration : end;
-    var a = s - 0.15;
-    var b = s + 0.15;
-    ok(
-      v.currentTime >= a && v.currentTime <= b,
-      "loadedmetadata currentTime is " + a + " < " + v.currentTime + " < " + b
-    );
-    ok(
-      v.mozFragmentEnd == e,
-      "mozFragmentEnd (" + v.mozFragmentEnd + ") == end Time (" + e + ")"
-    );
-    finish();
-  }
 
-  v.addEventListener("loadedmetadata", onLoadedMetadata);
+function onLoadedMetadata() {
+  var s = start == null ? 0 : start;
+  var e = end == null ? v.duration : end;
+  var a = s - 0.15;
+  var b = s + 0.15;
+  ok(v.currentTime >= a && v.currentTime <= b, "loadedmetadata currentTime is " + a + " < " + v.currentTime + " < " + b);
+  ok(v.mozFragmentEnd == e, "mozFragmentEnd (" + v.mozFragmentEnd + ") == end Time (" + e + ")");
+  finish();
+}
+
+v.addEventListener("loadedmetadata", onLoadedMetadata);
 }
diff --git a/dom/media/test/fragment_play.js b/dom/media/test/fragment_play.js
index ec0fe7952abf..3c717f3c7001 100644
--- a/dom/media/test/fragment_play.js
+++ b/dom/media/test/fragment_play.js
@@ -1,92 +1,67 @@
 function test_fragment_play(v, start, end, is, ok, finish) {
-  var completed = false;
-  var loadedMetadataRaised = false;
-  var seekedRaised = false;
-  var pausedRaised = false;
 
-  function onLoadedMetadata() {
-    var s = start == null ? 0 : start;
-    var e = end == null ? v.duration : end;
-    ok(
-      v.currentTime == s,
-      "loadedmetadata currentTime is " + v.currentTime + " != " + s
-    );
-    ok(
-      v.mozFragmentEnd == e,
-      "mozFragmentEnd (" + v.mozFragmentEnd + ") == end Time (" + e + ")"
-    );
-    loadedMetadataRaised = true;
-    v.play();
-  }
+var completed = false;
+var loadedMetadataRaised = false;
+var seekedRaised = false;
+var pausedRaised = false;
 
-  function onSeeked() {
-    if (completed) {
-      return;
-    }
-
-    var s = start == null ? 0 : start;
-    ok(
-      v.currentTime - s < 0.1,
-      "seeked currentTime is " +
-        v.currentTime +
-        " != " +
-        s +
-        " (fuzzy compare +-0.1)"
-    );
-
-    seekedRaised = true;
-  }
-
-  function onTimeUpdate() {
-    if (completed) {
-      return;
-    }
-
-    v._lastTimeUpdate = v.currentTime;
-  }
-
-  function onPause() {
-    if (completed) {
-      return;
-    }
-
-    var e = end == null ? v.duration : end;
-    var a = e - 0.05;
-    var b = e + 0.05;
-    ok(
-      v.currentTime >= a && v.currentTime <= b,
-      "paused currentTime is " +
-        a +
-        " < " +
-        v.currentTime +
-        " < " +
-        b +
-        " ? " +
-        v._lastTimeUpdate
-    );
-    pausedRaised = true;
-    v.play();
-  }
-
-  function onEnded() {
-    if (completed) {
-      return;
-    }
-
-    completed = true;
-    ok(loadedMetadataRaised, "loadedmetadata event");
-    if (start) {
-      ok(seekedRaised, "seeked event");
-    }
-    if (end) {
-      ok(pausedRaised, "paused event: " + end + " " + v.duration);
-    }
-    finish();
-  }
-
-  v.addEventListener("ended", onEnded);
-  v.addEventListener("loadedmetadata", onLoadedMetadata);
-  v.addEventListener("seeked", onSeeked);
-  v.addEventListener("pause", onPause);
-  v.addEventListener("timeupdate", onTimeUpdate);
+function onLoadedMetadata() {
+  var s = start == null ? 0 : start;
+  var e = end == null ? v.duration : end;
+  ok(v.currentTime == s, "loadedmetadata currentTime is " + v.currentTime + " != " + s);
+  ok(v.mozFragmentEnd == e, "mozFragmentEnd (" + v.mozFragmentEnd + ") == end Time (" + e + ")");
+  loadedMetadataRaised = true; 
+  v.play();
+}
+
+function onSeeked() {
+  if (completed)
+    return;
+
+  var s = start == null ? 0 : start;
+  ok(v.currentTime - s < 0.1, "seeked currentTime is " + v.currentTime + " != " + s + " (fuzzy compare +-0.1)");
+
+  seekedRaised = true;
+}
+
+function onTimeUpdate() {
+  if (completed)
+    return;
+
+  v._lastTimeUpdate = v.currentTime;
+}
+
+function onPause() {
+  if (completed)
+    return;
+
+  var e = end == null ? v.duration : end;
+  var a = e - 0.05;
+  var b = e + 0.05;
+  ok(v.currentTime >= a && v.currentTime <= b, "paused currentTime is " + a + " < " + v.currentTime + " < " + b + " ? " + v._lastTimeUpdate);
+  pausedRaised = true;
+  v.play();
+}
+
+
+function onEnded() {
+  if (completed)
+    return;
+
+  completed = true;
+  ok(loadedMetadataRaised, "loadedmetadata event");
+  if (start) {
+    ok(seekedRaised, "seeked event");
+  }
+  if (end) {
+    ok(pausedRaised, "paused event: " + end + " " + v.duration);
+  }
+  finish();
+}
+
+v.addEventListener("ended", onEnded);
+v.addEventListener("loadedmetadata", onLoadedMetadata);
+v.addEventListener("seeked", onSeeked);
+v.addEventListener("pause", onPause);
+v.addEventListener("timeupdate", onTimeUpdate);
 }
diff --git a/dom/media/test/gUM_support.js b/dom/media/test/gUM_support.js
index 2be885abf44c..1bff9f5675ef 100644
--- a/dom/media/test/gUM_support.js
+++ b/dom/media/test/gUM_support.js
@@ -9,26 +9,17 @@ async function pushGetUserMediaTestPrefs({
   fakeAudio = false,
   fakeVideo = false,
   loopbackAudio = false,
-  loopbackVideo = false,
-}) {
+  loopbackVideo = false}) {
   // Make sure we have sensical arguments
   if (!fakeAudio && !loopbackAudio) {
-    throw new Error(
-      "pushGetUserMediaTestPrefs: Should have fake or loopback audio!"
-    );
+    throw new Error("pushGetUserMediaTestPrefs: Should have fake or loopback audio!");
   } else if (fakeAudio && loopbackAudio) {
-    throw new Error(
-      "pushGetUserMediaTestPrefs: Should not have both fake and loopback audio!"
-    );
+    throw new Error("pushGetUserMediaTestPrefs: Should not have both fake and loopback audio!");
   }
   if (!fakeVideo && !loopbackVideo) {
-    throw new Error(
-      "pushGetUserMediaTestPrefs: Should have fake or loopback video!"
-    );
+    throw new Error("pushGetUserMediaTestPrefs: Should have fake or loopback video!");
   } else if (fakeVideo && loopbackVideo) {
-    throw new Error(
-      "pushGetUserMediaTestPrefs: Should not have both fake and loopback video!"
-    );
+    throw new Error("pushGetUserMediaTestPrefs: Should not have both fake and loopback video!");
   }
 
   let testPrefs = [];
@@ -41,15 +32,10 @@ async function pushGetUserMediaTestPrefs({
   if (loopbackAudio) {
     // If audio loopback is requested we expect the test harness to have set
     // the loopback device pref, make sure it's set
-    let audioLoopDev = SpecialPowers.getCharPref(
-      "media.audio_loopback_dev",
-      ""
-    );
+    let audioLoopDev = SpecialPowers.getCharPref("media.audio_loopback_dev", "");
     if (!audioLoopDev) {
-      throw new Error(
-        "pushGetUserMediaTestPrefs: Loopback audio requested but " +
-          "media.audio_loopback_dev does not appear to be set!"
-      );
+      throw new Error("pushGetUserMediaTestPrefs: Loopback audio requested but " +
+        "media.audio_loopback_dev does not appear to be set!");
     }
   }
   if (fakeVideo) {
@@ -61,23 +47,18 @@ async function pushGetUserMediaTestPrefs({
   if (loopbackVideo) {
     // If video loopback is requested we expect the test harness to have set
     // the loopback device pref, make sure it's set
-    let videoLoopDev = SpecialPowers.getCharPref(
-      "media.video_loopback_dev",
-      ""
-    );
+    let videoLoopDev = SpecialPowers.getCharPref("media.video_loopback_dev", "");
     if (!videoLoopDev) {
-      throw new Error(
-        "pushGetUserMediaTestPrefs: Loopback video requested but " +
-          "media.video_loopback_dev does not appear to be set!"
-      );
+      throw new Error("pushGetUserMediaTestPrefs: Loopback video requested but " +
+        "media.video_loopback_dev does not appear to be set!");
     }
   }
   if (loopbackAudio || loopbackVideo) {
     // Prevent gUM permission prompt. Since loopback devices are considered
     // real devices we need to set prefs so the gUM prompt isn't presented.
-    testPrefs.push(["media.navigator.permission.disabled", true]);
+    testPrefs.push(['media.navigator.permission.disabled', true]);
   }
-  return SpecialPowers.pushPrefEnv({ set: testPrefs });
+  return SpecialPowers.pushPrefEnv({set: testPrefs});
 }
 
 // Setup preconditions for tests using getUserMedia. This function will
@@ -85,7 +66,7 @@ async function pushGetUserMediaTestPrefs({
 // names already set in the prefs. If no loopback device name can be found then
 // prefs are setup such that a fake device is used.
 async function setupGetUserMediaTestPrefs() {
-  let prefRequests = {};
+  prefRequests = {};
   let audioLoopDev = SpecialPowers.getCharPref("media.audio_loopback_dev", "");
   if (audioLoopDev) {
     prefRequests.fakeAudio = false;
diff --git a/dom/media/test/manifest.js b/dom/media/test/manifest.js
index fc520ca57953..217c1b78667f 100644
--- a/dom/media/test/manifest.js
+++ b/dom/media/test/manifest.js
@@ -8,9 +8,7 @@
 // the prefs, the APIs it exposes will not take those prefs into account.  We
 // work around this by using a navigator object from a different global for our
 // UA string testing.
-var gManifestNavigatorSource = document.documentElement.appendChild(
-  document.createElement("iframe")
-);
+var gManifestNavigatorSource = document.documentElement.appendChild(document.createElement("iframe"));
 gManifestNavigatorSource.style.display = "none";
 function manifestNavigator() {
   return gManifestNavigatorSource.contentWindow.navigator;
@@ -21,239 +19,129 @@ function manifestNavigator() {
 // prefs are pushed, then we'd instantiate HTMLMediaElement.prototype before the
 // prefs are pushed and APIs we expect to be on that object would not be there.
 function manifestVideo() {
-  return gManifestNavigatorSource.contentDocument.createElement("video");
+  return gManifestNavigatorSource.contentDocument.createElement('video');
 }
 
 // Need to get the server url composed with ip:port instead of mochi.test.
 // Since we will provide the url to Exoplayer which cannot recognize the domain
 // name "mochi.test".
-let serverUrl = SpecialPowers.Services.prefs.getCharPref(
-  "media.hls.server.url"
-);
+let serverUrl = SpecialPowers.Services.prefs.getCharPref("media.hls.server.url");
 var gHLSTests = [
-  {
-    name: serverUrl + "/bipbop_4x3_variant.m3u8",
-    type: "audio/x-mpegurl",
-    duration: 20.0,
-  },
+  { name: serverUrl + "/bipbop_4x3_variant.m3u8", type:"audio/x-mpegurl", duration:20.000 }
 ];
 
 // These are small test files, good for just seeing if something loads. We
 // really only need one test file per backend here.
 var gSmallTests = [
-  { name: "small-shot.ogg", type: "audio/ogg", duration: 0.276 },
-  { name: "small-shot.m4a", type: "audio/mp4", duration: 0.29 },
-  { name: "small-shot.mp3", type: "audio/mpeg", duration: 0.27 },
-  { name: "small-shot-mp3.mp4", type: "audio/mp4; codecs=mp3", duration: 0.34 },
-  { name: "small-shot.flac", type: "audio/flac", duration: 0.197 },
-  { name: "r11025_s16_c1-short.wav", type: "audio/x-wav", duration: 0.37 },
-  {
-    name: "320x240.ogv",
-    type: "video/ogg",
-    width: 320,
-    height: 240,
-    duration: 0.266,
-  },
-  {
-    name: "seek-short.webm",
-    type: "video/webm",
-    width: 320,
-    height: 240,
-    duration: 0.23,
-  },
-  {
-    name: "vp9-short.webm",
-    type: "video/webm",
-    width: 320,
-    height: 240,
-    duration: 0.2,
-  },
-  {
-    name: "detodos-short.opus",
-    type: "audio/ogg; codecs=opus",
-    duration: 0.22,
-  },
-  {
-    name: "gizmo-short.mp4",
-    type: "video/mp4",
-    width: 560,
-    height: 320,
-    duration: 0.27,
-  },
-  { name: "flac-s24.flac", type: "audio/flac", duration: 4.04 },
-  { name: "bogus.duh", type: "bogus/duh" },
+  { name:"small-shot.ogg", type:"audio/ogg", duration:0.276 },
+  { name:"small-shot.m4a", type:"audio/mp4", duration:0.29 },
+  { name:"small-shot.mp3", type:"audio/mpeg", duration:0.27 },
+  { name:"small-shot-mp3.mp4", type:"audio/mp4; codecs=mp3", duration:0.34 },
+  { name:"small-shot.flac", type:"audio/flac", duration:0.197 },
+  { name:"r11025_s16_c1-short.wav", type:"audio/x-wav", duration:0.37 },
+  { name:"320x240.ogv", type:"video/ogg", width:320, height:240, duration:0.266 },
+  { name:"seek-short.webm", type:"video/webm", width:320, height:240, duration:0.23 },
+  { name:"vp9-short.webm", type:"video/webm", width:320, height:240, duration:0.20 },
+  { name:"detodos-short.opus", type:"audio/ogg; codecs=opus", duration:0.22 },
+  { name:"gizmo-short.mp4", type:"video/mp4", width:560, height:320, duration:0.27 },
+  { name:"flac-s24.flac", type:"audio/flac", duration:4.04 },
+  { name:"bogus.duh", type:"bogus/duh" }
 ];
 
 var gFrameCountTests = [
-  { name: "bipbop.mp4", type: "video/mp4", totalFrameCount: 297 },
-  { name: "gizmo.mp4", type: "video/mp4", totalFrameCount: 166 },
-  { name: "seek-short.webm", type: "video/webm", totalFrameCount: 8 },
-  { name: "seek.webm", type: "video/webm", totalFrameCount: 120 },
-  { name: "320x240.ogv", type: "video/ogg", totalFrameCount: 8 },
-  { name: "av1.mp4", type: "video/mp4", totalFrameCount: 24 },
+  { name:"bipbop.mp4", type:"video/mp4", totalFrameCount:297},
+  { name:"gizmo.mp4", type:"video/mp4", totalFrameCount:166},
+  { name:"seek-short.webm", type:"video/webm", totalFrameCount:8},
+  { name:"seek.webm", type:"video/webm", totalFrameCount:120},
+  { name:"320x240.ogv", type:"video/ogg", totalFrameCount:8},
+  { name:"av1.mp4", type:"video/mp4", totalFrameCount:24},
 ];
 
 gSmallTests = gSmallTests.concat([
-  { name: "sample.3gp", type: "video/3gpp", duration: 4.933 },
-  { name: "sample.3g2", type: "video/3gpp2", duration: 4.933 },
+  { name:"sample.3gp", type:"video/3gpp", duration:4.933 },
+  { name:"sample.3g2", type:"video/3gpp2", duration:4.933 }
 ]);
 
 // Used by test_bug654550.html, for videoStats preference
 var gVideoTests = [
-  {
-    name: "320x240.ogv",
-    type: "video/ogg",
-    width: 320,
-    height: 240,
-    duration: 0.266,
-  },
-  {
-    name: "seek-short.webm",
-    type: "video/webm",
-    width: 320,
-    height: 240,
-    duration: 0.23,
-  },
-  { name: "bogus.duh", type: "bogus/duh" },
+  { name:"320x240.ogv", type:"video/ogg", width:320, height:240, duration:0.266 },
+  { name:"seek-short.webm", type:"video/webm", width:320, height:240, duration:0.23 },
+  { name:"bogus.duh", type:"bogus/duh" }
 ];
 
 // Temp hack for trackIDs and captureStream() -- bug 1215769
 var gLongerTests = [
-  {
-    name: "seek.webm",
-    type: "video/webm",
-    width: 320,
-    height: 240,
-    duration: 3.966,
-  },
-  {
-    name: "gizmo.mp4",
-    type: "video/mp4",
-    width: 560,
-    height: 320,
-    duration: 5.56,
-  },
+  { name:"seek.webm", type:"video/webm", width:320, height:240, duration:3.966 },
+  { name:"gizmo.mp4", type:"video/mp4", width:560, height:320, duration:5.56 },
 ];
 
 // Used by test_progress to ensure we get the correct progress information
 // during resource download.
 var gProgressTests = [
-  { name: "r11025_u8_c1.wav", type: "audio/x-wav", duration: 1.0, size: 11069 },
-  { name: "big-short.wav", type: "audio/x-wav", duration: 1.11, size: 12366 },
-  { name: "seek-short.ogv", type: "video/ogg", duration: 1.03, size: 79921 },
-  {
-    name: "320x240.ogv",
-    type: "video/ogg",
-    width: 320,
-    height: 240,
-    duration: 0.266,
-    size: 28942,
-  },
-  { name: "seek-short.webm", type: "video/webm", duration: 0.23, size: 19267 },
-  { name: "gizmo-short.mp4", type: "video/mp4", duration: 0.27, size: 29905 },
-  { name: "bogus.duh", type: "bogus/duh" },
+  { name:"r11025_u8_c1.wav", type:"audio/x-wav", duration:1.0, size:11069 },
+  { name:"big-short.wav", type:"audio/x-wav", duration:1.11, size:12366 },
+  { name:"seek-short.ogv", type:"video/ogg", duration:1.03, size:79921 },
+  { name:"320x240.ogv", type:"video/ogg", width:320, height:240, duration:0.266, size:28942 },
+  { name:"seek-short.webm", type:"video/webm", duration:0.23, size:19267 },
+  { name:"gizmo-short.mp4", type:"video/mp4", duration:0.27, size:29905 },
+  { name:"bogus.duh", type:"bogus/duh" }
 ];
 
 // Used by test_played.html
 var gPlayedTests = [
-  { name: "big-short.wav", type: "audio/x-wav", duration: 1.11 },
-  { name: "seek-short.ogv", type: "video/ogg", duration: 1.03 },
-  { name: "seek-short.webm", type: "video/webm", duration: 0.23 },
-  { name: "gizmo-short.mp4", type: "video/mp4", duration: 0.27 },
-  { name: "owl-short.mp3", type: "audio/mpeg", duration: 0.52 },
-  { name: "very-short.mp3", type: "audio/mpeg", duration: 0.07 },
+  { name:"big-short.wav", type:"audio/x-wav", duration:1.11 },
+  { name:"seek-short.ogv", type:"video/ogg", duration:1.03 },
+  { name:"seek-short.webm", type:"video/webm", duration:0.23 },
+  { name:"gizmo-short.mp4", type:"video/mp4", duration:0.27 },
+  { name:"owl-short.mp3", type:"audio/mpeg", duration:0.52 },
+  { name:"very-short.mp3", type:"audio/mpeg", duration:0.07 },
   // Disable vbr.mp3 to see if it reduces the error of AUDCLNT_E_CPUUSAGE_EXCEEDED.
   // See bug 1110922 comment 26.
   //{ name:"vbr.mp3", type:"audio/mpeg", duration:10.0 },
-  { name: "bug495794.ogg", type: "audio/ogg", duration: 0.3 },
+  { name:"bug495794.ogg", type:"audio/ogg", duration:0.3 },
 ];
 
-if (
-  manifestNavigator().userAgent.includes("Windows") &&
-  manifestVideo().canPlayType('video/mp4; codecs="avc1.42E01E"')
-) {
-  gPlayedTests = gPlayedTests.concat(
-    { name: "red-46x48.mp4", type: "video/mp4", duration: 1.0 },
-    { name: "red-48x46.mp4", type: "video/mp4", duration: 1.0 }
-  );
+if (manifestNavigator().userAgent.includes("Windows") &&
+    manifestVideo().canPlayType('video/mp4; codecs="avc1.42E01E"')) {
+  gPlayedTests = gPlayedTests.concat({name: "red-46x48.mp4", type:"video/mp4", duration:1.00},
+                                     {name: "red-48x46.mp4", type:"video/mp4", duration:1.00});
 }
 
 // Used by test_mozLoadFrom.  Need one test file per decoder backend, plus
 // anything for testing clone-specific bugs.
-var cloneKey = Math.floor(Math.random() * 100000000);
+var cloneKey = Math.floor(Math.random()*100000000);
 var gCloneTests = [
   // short-video is more like 1s, so if you load this twice you'll get an unexpected duration
-  {
-    name:
-      "dynamic_resource.sjs?key=" +
-      cloneKey +
-      "&res1=320x240.ogv&res2=short-video.ogv",
-    type: "video/ogg",
-    duration: 0.266,
-  },
+  { name:"dynamic_resource.sjs?key=" + cloneKey + "&res1=320x240.ogv&res2=short-video.ogv",
+    type:"video/ogg", duration:0.266 },
 ];
 
 // Used by test_play_twice.  Need one test file per decoder backend, plus
 // anything for testing bugs that occur when replying a played file.
 var gReplayTests = gSmallTests.concat([
-  { name: "bug533822.ogg", type: "audio/ogg" },
+  { name:"bug533822.ogg", type:"audio/ogg" },
 ]);
 
 // Used by test_paused_after_ended. Need one test file per decoder backend, plus
 // anything for testing bugs that occur when replying a played file.
 var gPausedAfterEndedTests = gSmallTests.concat([
-  { name: "r11025_u8_c1.wav", type: "audio/x-wav", duration: 1.0 },
-  { name: "small-shot.ogg", type: "video/ogg", duration: 0.276 },
+  { name:"r11025_u8_c1.wav", type:"audio/x-wav", duration:1.0 },
+  { name:"small-shot.ogg", type:"video/ogg", duration:0.276 }
 ]);
 
 // Test the mozHasAudio property, and APIs that detect different kinds of
 // tracks
 var gTrackTests = [
-  {
-    name: "big-short.wav",
-    type: "audio/x-wav",
-    duration: 1.11,
-    size: 12366,
-    hasAudio: true,
-    hasVideo: false,
-  },
-  {
-    name: "320x240.ogv",
-    type: "video/ogg",
-    width: 320,
-    height: 240,
-    duration: 0.266,
-    size: 28942,
-    hasAudio: false,
-    hasVideo: true,
-  },
-  {
-    name: "short-video.ogv",
-    type: "video/ogg",
-    duration: 1.081,
-    hasAudio: true,
-    hasVideo: true,
-  },
-  {
-    name: "seek-short.webm",
-    type: "video/webm",
-    duration: 0.23,
-    size: 19267,
-    hasAudio: false,
-    hasVideo: true,
-  },
-  {
-    name: "flac-s24.flac",
-    type: "audio/flac",
-    duration: 4.04,
-    hasAudio: true,
-    hasVideo: false,
-  },
-  { name: "bogus.duh", type: "bogus/duh" },
+  { name:"big-short.wav", type:"audio/x-wav", duration:1.11, size:12366, hasAudio:true, hasVideo:false },
+  { name:"320x240.ogv", type:"video/ogg", width:320, height:240, duration:0.266, size:28942, hasAudio:false, hasVideo:true },
+  { name:"short-video.ogv", type:"video/ogg", duration:1.081, hasAudio:true, hasVideo:true },
+  { name:"seek-short.webm", type:"video/webm", duration:0.23, size:19267, hasAudio:false, hasVideo:true },
+  { name:"flac-s24.flac", type:"audio/flac", duration:4.04, hasAudio:true, hasVideo:false },
+  { name:"bogus.duh", type:"bogus/duh" }
 ];
 
 var gClosingConnectionsTest = [
-  { name: "seek-short.ogv", type: "video/ogg", duration: 1.03 },
+  { name:"seek-short.ogv", type:"video/ogg", duration:1.03 },
 ];
 
 // Used by any media recorder test. Need one test file per decoder backend
@@ -261,22 +149,12 @@ var gClosingConnectionsTest = [
 var gMediaRecorderTests = [
   // Duration should be greater than 500ms because we will record 2
   // time slices (250ms per slice)
-  {
-    name: "detodos-recorder-test.opus",
-    type: "audio/ogg; codecs=opus",
-    duration: 0.62,
-  },
+  { name:"detodos-recorder-test.opus", type:"audio/ogg; codecs=opus", duration:0.62 }
 ];
 
 // Used by video media recorder tests
 var gMediaRecorderVideoTests = [
-  {
-    name: "seek-short.webm",
-    type: "video/webm",
-    width: 320,
-    height: 240,
-    duration: 0.23,
-  },
+  { name:"seek-short.webm", type:"video/webm", width:320, height:240, duration:0.23 },
 ];
 
 // These are files that we want to make sure we can play through.  We can
@@ -285,346 +163,245 @@ var gMediaRecorderVideoTests = [
 // Used by test_playback, which expects no error event and one ended event.
 var gPlayTests = [
   // Test playback of a WebM file with vp9 video
-  { name: "vp9cake-short.webm", type: "video/webm", duration: 1.0 },
+  { name:"vp9cake-short.webm", type:"video/webm", duration:1.00 },
   // 8-bit samples
-  { name: "r11025_u8_c1.wav", type: "audio/x-wav", duration: 1.0 },
+  { name:"r11025_u8_c1.wav", type:"audio/x-wav", duration:1.0 },
   // 8-bit samples, file is truncated
-  { name: "r11025_u8_c1_trunc.wav", type: "audio/x-wav", duration: 1.8 },
+  { name:"r11025_u8_c1_trunc.wav", type:"audio/x-wav", duration:1.8 },
   // file has trailing non-PCM data
-  { name: "r11025_s16_c1_trailing.wav", type: "audio/x-wav", duration: 1.0 },
+  { name:"r11025_s16_c1_trailing.wav", type:"audio/x-wav", duration:1.0 },
   // file with list chunk
-  { name: "r16000_u8_c1_list.wav", type: "audio/x-wav", duration: 4.2 },
+  { name:"r16000_u8_c1_list.wav", type:"audio/x-wav", duration:4.2 },
   // file with 2 extra bytes of metadata
-  {
-    name: "16bit_wave_extrametadata.wav",
-    type: "audio/x-wav",
-    duration: 1.108,
-  },
+  { name:"16bit_wave_extrametadata.wav", type:"audio/x-wav", duration:1.108 },
   // 24-bit samples
-  { name: "wavedata_s24.wav", type: "audio/x-wav", duration: 1.0 },
+  { name:"wavedata_s24.wav", type:"audio/x-wav", duration:1.0 },
   // aLaw compressed wave file
-  { name: "wavedata_alaw.wav", type: "audio/x-wav", duration: 1.0 },
+  { name:"wavedata_alaw.wav", type:"audio/x-wav", duration:1.0 },
   // uLaw compressed wave file
-  { name: "wavedata_ulaw.wav", type: "audio/x-wav", duration: 1.0 },
+  { name:"wavedata_ulaw.wav", type:"audio/x-wav", duration:1.0 },
   // Data length 0xFFFFFFFF
-  { name: "bug1301226.wav", type: "audio/x-wav", duration: 0.003673 },
+  { name:"bug1301226.wav", type:"audio/x-wav", duration:0.003673 },
   // Data length 0xFFFFFFFF and odd chunk lengths.
-  { name: "bug1301226-odd.wav", type: "audio/x-wav", duration: 0.003673 },
+  { name:"bug1301226-odd.wav", type:"audio/x-wav", duration:0.003673 },
 
   // Ogg stream without eof marker
-  { name: "bug461281.ogg", type: "application/ogg", duration: 2.208 },
+  { name:"bug461281.ogg", type:"application/ogg", duration:2.208 },
 
   // oggz-chop stream
-  { name: "bug482461.ogv", type: "video/ogg", duration: 4.34 },
+  { name:"bug482461.ogv", type:"video/ogg", duration:4.34 },
   // Theora only oggz-chop stream
-  { name: "bug482461-theora.ogv", type: "video/ogg", duration: 4.138 },
+  { name:"bug482461-theora.ogv", type:"video/ogg", duration:4.138 },
   // With first frame a "duplicate" (empty) frame.
-  {
-    name: "bug500311.ogv",
-    type: "video/ogg",
-    duration: 1.96,
-    contentDuration: 1.958,
-  },
+  { name:"bug500311.ogv", type:"video/ogg", duration:1.96, contentDuration:1.958 },
   // Small audio file
-  { name: "small-shot.ogg", type: "audio/ogg", duration: 0.276 },
+  { name:"small-shot.ogg", type:"audio/ogg", duration:0.276 },
   // More audio in file than video.
-  { name: "short-video.ogv", type: "video/ogg", duration: 1.081 },
+  { name:"short-video.ogv", type:"video/ogg", duration:1.081 },
   // First Theora data packet is zero bytes.
-  { name: "bug504613.ogv", type: "video/ogg", duration: Number.NaN },
+  { name:"bug504613.ogv", type:"video/ogg", duration:Number.NaN },
   // Multiple audio streams.
-  { name: "bug516323.ogv", type: "video/ogg", duration: 4.208 },
+  { name:"bug516323.ogv", type:"video/ogg", duration:4.208 },
   // oggz-chop with non-keyframe as first frame
-  {
-    name: "bug556821.ogv",
-    type: "video/ogg",
-    duration: 2.936,
-    contentDuration: 2.903,
-  },
+  { name:"bug556821.ogv", type:"video/ogg", duration:2.936, contentDuration:2.903 },
 
   // Encoded with vorbis beta1, includes unusually sized codebooks
-  { name: "beta-phrasebook.ogg", type: "audio/ogg", duration: 4.01 },
+  { name:"beta-phrasebook.ogg", type:"audio/ogg", duration:4.01 },
   // Small file, only 1 frame with audio only.
-  { name: "bug520493.ogg", type: "audio/ogg", duration: 0.458 },
+  { name:"bug520493.ogg", type:"audio/ogg", duration:0.458 },
   // Small file with vorbis comments with 0 length values and names.
-  { name: "bug520500.ogg", type: "audio/ogg", duration: 0.123 },
+  { name:"bug520500.ogg", type:"audio/ogg", duration:0.123 },
 
   // Various weirdly formed Ogg files
-  {
-    name: "bug499519.ogv",
-    type: "video/ogg",
-    duration: 0.24,
-    contentDuration: 0.22,
-  },
-  { name: "bug506094.ogv", type: "video/ogg", duration: 0 },
-  { name: "bug498855-1.ogv", type: "video/ogg", duration: 0.24 },
-  { name: "bug498855-2.ogv", type: "video/ogg", duration: 0.24 },
-  { name: "bug498855-3.ogv", type: "video/ogg", duration: 0.24 },
-  {
-    name: "bug504644.ogv",
-    type: "video/ogg",
-    duration: 1.6,
-    contentDuration: 1.52,
-  },
-  {
-    name: "chain.ogv",
-    type: "video/ogg",
-    duration: Number.NaN,
-    contentDuration: 0.266,
-  },
-  {
-    name: "bug523816.ogv",
-    type: "video/ogg",
-    duration: 0.766,
-    contentDuration: 0,
-  },
-  { name: "bug495129.ogv", type: "video/ogg", duration: 2.41 },
-  {
-    name: "bug498380.ogv",
-    type: "video/ogg",
-    duration: 0.7663,
-    contentDuration: 0,
-  },
-  { name: "bug495794.ogg", type: "audio/ogg", duration: 0.3 },
-  { name: "bug557094.ogv", type: "video/ogg", duration: 0.24 },
-  { name: "multiple-bos.ogg", type: "video/ogg", duration: 0.431 },
-  { name: "audio-overhang.ogg", type: "video/ogg", duration: 2.3 },
-  { name: "video-overhang.ogg", type: "video/ogg", duration: 3.966 },
+  { name:"bug499519.ogv", type:"video/ogg", duration:0.24, contentDuration:0.22 },
+  { name:"bug506094.ogv", type:"video/ogg", duration:0 },
+  { name:"bug498855-1.ogv", type:"video/ogg", duration:0.24 },
+  { name:"bug498855-2.ogv", type:"video/ogg", duration:0.24 },
+  { name:"bug498855-3.ogv", type:"video/ogg", duration:0.24 },
+  { name:"bug504644.ogv", type:"video/ogg", duration:1.6, contentDuration:1.52 },
+  { name:"chain.ogv", type:"video/ogg", duration:Number.NaN, contentDuration:0.266 },
+  { name:"bug523816.ogv", type:"video/ogg", duration:0.766, contentDuration:0 },
+  { name:"bug495129.ogv", type:"video/ogg", duration:2.41 },
+  { name:"bug498380.ogv", type:"video/ogg", duration:0.7663, contentDuration:0 },
+  { name:"bug495794.ogg", type:"audio/ogg", duration:0.3 },
+  { name:"bug557094.ogv", type:"video/ogg", duration:0.24 },
+  { name:"multiple-bos.ogg", type:"video/ogg", duration:0.431 },
+  { name:"audio-overhang.ogg", type:"video/ogg", duration:2.3 },
+  { name:"video-overhang.ogg", type:"video/ogg", duration:3.966 },
 
   // bug461281.ogg with the middle second chopped out.
-  { name: "audio-gaps.ogg", type: "audio/ogg", duration: 2.208 },
+  { name:"audio-gaps.ogg", type:"audio/ogg", duration:2.208 },
 
   // Test playback/metadata work after a redirect
-  {
-    name: "redirect.sjs?domain=mochi.test:8888&file=320x240.ogv",
-    type: "video/ogg",
-    duration: 0.266,
-  },
+  { name:"redirect.sjs?domain=mochi.test:8888&file=320x240.ogv",
+    type:"video/ogg", duration:0.266 },
 
   // Test playback of a webm file
-  { name: "seek-short.webm", type: "video/webm", duration: 0.23 },
+  { name:"seek-short.webm", type:"video/webm", duration:0.23 },
 
   // Test playback of a webm file with 'matroska' doctype
-  { name: "bug1377278.webm", type: "video/webm", duration: 4.0 },
+  { name:"bug1377278.webm", type:"video/webm", duration:4.0 },
 
   // Test playback of a WebM file with non-zero start time.
-  { name: "split.webm", type: "video/webm", duration: 1.967 },
+  { name:"split.webm", type:"video/webm", duration:1.967 },
 
   // Test playback of a WebM file with resolution changes.
-  { name: "resolution-change.webm", type: "video/webm", duration: 6.533 },
+  { name:"resolution-change.webm", type:"video/webm", duration:6.533 },
 
   // A really short, low sample rate, single channel file. This tests whether
   // we can handle playing files when only push very little audio data to the
   // hardware.
-  { name: "spacestorm-1000Hz-100ms.ogg", type: "audio/ogg", duration: 0.099 },
+  { name:"spacestorm-1000Hz-100ms.ogg", type:"audio/ogg", duration:0.099 },
 
   // Opus data in an ogg container
-  {
-    name: "detodos-short.opus",
-    type: "audio/ogg; codecs=opus",
-    duration: 0.22,
-    contentDuration: 0.2135,
-  },
+  { name:"detodos-short.opus", type:"audio/ogg; codecs=opus", duration:0.22, contentDuration:0.2135 },
   // Opus data in a webm container
-  {
-    name: "detodos-short.webm",
-    type: "audio/webm; codecs=opus",
-    duration: 0.26,
-    contentDuration: 0.2535,
-  },
+  { name:"detodos-short.webm", type:"audio/webm; codecs=opus", duration:0.26, contentDuration:0.2535 },
   // Opus in webm channel mapping=2 sample file
-  {
-    name: "opus-mapping2.webm",
-    type: "audio/webm; codecs=opus",
-    duration: 10.01,
-    contentDuration: 9.99,
-  },
-  { name: "bug1066943.webm", type: "audio/webm; codecs=opus", duration: 1.383 },
+  { name:"opus-mapping2.webm", type:"audio/webm; codecs=opus", duration:10.01, contentDuration:9.99 },
+  { name:"bug1066943.webm", type:"audio/webm; codecs=opus", duration:1.383 },
 
   // Multichannel Opus in an ogg container
-  { name: "test-1-mono.opus", type: "audio/ogg; codecs=opus", duration: 1.044 },
-  {
-    name: "test-2-stereo.opus",
-    type: "audio/ogg; codecs=opus",
-    duration: 2.925,
-  },
-  { name: "test-3-LCR.opus", type: "audio/ogg; codecs=opus", duration: 4.214 },
-  { name: "test-4-quad.opus", type: "audio/ogg; codecs=opus", duration: 6.234 },
-  { name: "test-5-5.0.opus", type: "audio/ogg; codecs=opus", duration: 7.558 },
-  { name: "test-6-5.1.opus", type: "audio/ogg; codecs=opus", duration: 10.333 },
-  { name: "test-7-6.1.opus", type: "audio/ogg; codecs=opus", duration: 11.69 },
-  { name: "test-8-7.1.opus", type: "audio/ogg; codecs=opus", duration: 13.478 },
+  { name:"test-1-mono.opus", type:"audio/ogg; codecs=opus", duration:1.044 },
+  { name:"test-2-stereo.opus", type:"audio/ogg; codecs=opus", duration:2.925 },
+  { name:"test-3-LCR.opus", type:"audio/ogg; codecs=opus", duration:4.214 },
+  { name:"test-4-quad.opus", type:"audio/ogg; codecs=opus", duration:6.234 },
+  { name:"test-5-5.0.opus", type:"audio/ogg; codecs=opus", duration:7.558 },
+  { name:"test-6-5.1.opus", type:"audio/ogg; codecs=opus", duration:10.333 },
+  { name:"test-7-6.1.opus", type:"audio/ogg; codecs=opus", duration:11.690 },
+  { name:"test-8-7.1.opus", type:"audio/ogg; codecs=opus", duration:13.478 },
 
-  {
-    name: "gizmo-short.mp4",
-    type: "video/mp4",
-    duration: 0.27,
-    contentDuration: 0.267,
-  },
+  { name:"gizmo-short.mp4", type:"video/mp4", duration:0.27, contentDuration:0.267 },
   // Test playback of a MP4 file with a non-zero start time (and audio starting
   // a second later).
-  { name: "bipbop-lateaudio.mp4", type: "video/mp4" },
+  { name:"bipbop-lateaudio.mp4", type:"video/mp4" },
   // Ambisonics AAC, requires AAC extradata to be set when creating decoder (see bug 1431169)
   // Also test 4.0 decoding.
-  { name: "ambisonics.mp4", type: "audio/mp4", duration: 16.48 },
+  { name:"ambisonics.mp4", type:"audio/mp4", duration:16.48 },
   // Opus in MP4 channel mapping=0 sample file (content shorter due to preskip)
-  {
-    name: "opus-sample.mp4",
-    type: "audio/mp4; codecs=opus",
-    duration: 10.92,
-    contentDuration: 10.09,
-  },
+  { name:"opus-sample.mp4", type:"audio/mp4; codecs=opus", duration:10.92, contentDuration:10.09 },
   // Opus in MP4 channel mapping=2 sample file
-  { name: "opus-mapping2.mp4", type: "audio/mp4; codecs=opus", duration: 10.0 },
+  { name:"opus-mapping2.mp4", type:"audio/mp4; codecs=opus", duration:10.0 },
 
-  { name: "small-shot.m4a", type: "audio/mp4", duration: 0.29 },
-  { name: "small-shot.mp3", type: "audio/mpeg", duration: 0.27 },
-  { name: "owl.mp3", type: "audio/mpeg", duration: 3.343 },
+  { name:"small-shot.m4a", type:"audio/mp4", duration:0.29 },
+  { name:"small-shot.mp3", type:"audio/mpeg", duration:0.27 },
+  { name:"owl.mp3", type:"audio/mpeg", duration:3.343 },
   // owl.mp3 as above, but with something funny going on in the ID3v2 tag
   // that caused DirectShow to fail.
-  { name: "owl-funny-id3.mp3", type: "audio/mpeg", duration: 3.343 },
+  { name:"owl-funny-id3.mp3", type:"audio/mpeg", duration:3.343 },
   // owl.mp3 as above, but with something even funnier going on in the ID3v2 tag
   // that caused DirectShow to fail.
-  { name: "owl-funnier-id3.mp3", type: "audio/mpeg", duration: 3.343 },
+  { name:"owl-funnier-id3.mp3", type:"audio/mpeg", duration:3.343 },
   // One second of silence with ~140KB of ID3 tags. Usually when the first MP3
   // frame is at such a high offset into the file, MP3FrameParser will give up
   // and report that the stream is not MP3. However, it does not count ID3 tags
   // in that offset. This test case makes sure that ID3 exclusion holds.
-  { name: "huge-id3.mp3", type: "audio/mpeg", duration: 1.0 },
+  { name:"huge-id3.mp3", type:"audio/mpeg", duration:1.00 },
   // A truncated VBR MP3 with just enough frames to keep most decoders happy.
   // The Xing header reports the length of the file to be around 10 seconds, but
   // there is really only one second worth of data. We want MP3FrameParser to
   // trust the header, so this should be reported as 10 seconds.
-  {
-    name: "vbr-head.mp3",
-    type: "audio/mpeg",
-    duration: 10.0,
-    contentDuration: 1.019,
-  },
+  { name:"vbr-head.mp3", type:"audio/mpeg", duration:10.00, contentDuration:1.019 },
 
   // A flac file where the STREAMINFO block was removed.
   // It is necessary to parse the file to find an audio frame instead.
-  { name: "flac-noheader-s16.flac", type: "audio/flac", duration: 4.0 },
-  { name: "flac-s24.flac", type: "audio/flac", duration: 4.04 },
-  {
-    name: "flac-sample.mp4",
-    type: "audio/mp4; codecs=flac",
-    duration: 4.95,
-    contentDuration: 5.03,
-  },
+  { name:"flac-noheader-s16.flac", type:"audio/flac", duration:4.0 },
+  { name:"flac-s24.flac", type:"audio/flac", duration:4.04 },
+  { name:"flac-sample.mp4", type:"audio/mp4; codecs=flac", duration:4.95, contentDuration:5.03 },
   // Ogg with theora video and flac audio.
-  {
-    name: "A4.ogv",
-    type: "video/ogg",
-    width: 320,
-    height: 240,
-    duration: 3.13,
-  },
+  { name:"A4.ogv", type:"video/ogg", width:320, height:240, duration:3.13 },
 
   // Invalid file
-  { name: "bogus.duh", type: "bogus/duh", duration: Number.NaN },
+  { name:"bogus.duh", type:"bogus/duh", duration:Number.NaN },
 ];
 
-const win32 =
-  SpecialPowers.Services.appinfo.OS == "WINNT" &&
-  !SpecialPowers.Services.appinfo.is64Bit;
+const win32 = SpecialPowers.Services.appinfo.OS == "WINNT" &&
+              !SpecialPowers.Services.appinfo.is64Bit;
 if (!win32) {
-  gPlayTests.push({ name: "av1.mp4", type: "video/mp4", duration: 1.0 });
+  gPlayTests.push({ name: "av1.mp4", type:"video/mp4", duration:1.00 });
 }
 
 var gSeekToNextFrameTests = [
   // Test playback of a WebM file with vp9 video
-  { name: "vp9-short.webm", type: "video/webm", duration: 0.2 },
-  { name: "vp9cake-short.webm", type: "video/webm", duration: 1.0 },
+  { name:"vp9-short.webm", type:"video/webm", duration:0.20 },
+  { name:"vp9cake-short.webm", type:"video/webm", duration:1.00 },
   // oggz-chop stream
-  { name: "bug482461.ogv", type: "video/ogg", duration: 4.34 },
+  { name:"bug482461.ogv", type:"video/ogg", duration:4.34 },
   // Theora only oggz-chop stream
-  { name: "bug482461-theora.ogv", type: "video/ogg", duration: 4.138 },
+  { name:"bug482461-theora.ogv", type:"video/ogg", duration:4.138 },
   // With first frame a "duplicate" (empty) frame.
-  { name: "bug500311.ogv", type: "video/ogg", duration: 1.96 },
+  { name:"bug500311.ogv", type:"video/ogg", duration:1.96 },
 
   // More audio in file than video.
-  { name: "short-video.ogv", type: "video/ogg", duration: 1.081 },
+  { name:"short-video.ogv", type:"video/ogg", duration:1.081 },
   // First Theora data packet is zero bytes.
-  { name: "bug504613.ogv", type: "video/ogg", duration: Number.NaN },
+  { name:"bug504613.ogv", type:"video/ogg", duration:Number.NaN },
   // Multiple audio streams.
-  { name: "bug516323.ogv", type: "video/ogg", duration: 4.208 },
+  { name:"bug516323.ogv", type:"video/ogg", duration:4.208 },
   // oggz-chop with non-keyframe as first frame
-  { name: "bug556821.ogv", type: "video/ogg", duration: 2.936 },
+  { name:"bug556821.ogv", type:"video/ogg", duration:2.936 },
   // Various weirdly formed Ogg files
-  { name: "bug498855-1.ogv", type: "video/ogg", duration: 0.24 },
-  { name: "bug498855-2.ogv", type: "video/ogg", duration: 0.24 },
-  { name: "bug498855-3.ogv", type: "video/ogg", duration: 0.24 },
-  { name: "bug504644.ogv", type: "video/ogg", duration: 1.6 },
+  { name:"bug498855-1.ogv", type:"video/ogg", duration:0.24 },
+  { name:"bug498855-2.ogv", type:"video/ogg", duration:0.24 },
+  { name:"bug498855-3.ogv", type:"video/ogg", duration:0.24 },
+  { name:"bug504644.ogv", type:"video/ogg", duration:1.6 },
 
-  { name: "bug523816.ogv", type: "video/ogg", duration: 0.766 },
+  { name:"bug523816.ogv", type:"video/ogg", duration:0.766 },
 
-  { name: "bug498380.ogv", type: "video/ogg", duration: 0.2 },
-  { name: "bug557094.ogv", type: "video/ogg", duration: 0.24 },
-  { name: "multiple-bos.ogg", type: "video/ogg", duration: 0.431 },
+  { name:"bug498380.ogv", type:"video/ogg", duration:0.2 },
+  { name:"bug557094.ogv", type:"video/ogg", duration:0.24 },
+  { name:"multiple-bos.ogg", type:"video/ogg", duration:0.431 },
   // Test playback/metadata work after a redirect
-  {
-    name: "redirect.sjs?domain=mochi.test:8888&file=320x240.ogv",
-    type: "video/ogg",
-    duration: 0.266,
-  },
+  { name:"redirect.sjs?domain=mochi.test:8888&file=320x240.ogv",
+    type:"video/ogg", duration:0.266 },
   // Test playback of a webm file
-  { name: "seek-short.webm", type: "video/webm", duration: 0.23 },
+  { name:"seek-short.webm", type:"video/webm", duration:0.23 },
   // Test playback of a WebM file with non-zero start time.
-  { name: "split.webm", type: "video/webm", duration: 1.967 },
+  { name:"split.webm", type:"video/webm", duration:1.967 },
 
-  { name: "gizmo-short.mp4", type: "video/mp4", duration: 0.27 },
+  { name:"gizmo-short.mp4", type:"video/mp4", duration:0.27 },
 
   // Test playback of a MP4 file with a non-zero start time (and audio starting
   // a second later).
-  { name: "bipbop-lateaudio.mp4", type: "video/mp4" },
+  { name:"bipbop-lateaudio.mp4", type:"video/mp4" },
 ];
 
 // A file for each type we can support.
 var gSnifferTests = [
-  { name: "big.wav", type: "audio/x-wav", duration: 9.278982, size: 102444 },
-  {
-    name: "320x240.ogv",
-    type: "video/ogg",
-    width: 320,
-    height: 240,
-    duration: 0.233,
-    size: 28942,
-  },
-  { name: "seek.webm", type: "video/webm", duration: 3.966, size: 215529 },
-  { name: "gizmo.mp4", type: "video/mp4", duration: 5.56, size: 383631 },
+  { name:"big.wav", type:"audio/x-wav", duration:9.278982, size:102444 },
+  { name:"320x240.ogv", type:"video/ogg", width:320, height:240, duration:0.233, size:28942 },
+  { name:"seek.webm", type:"video/webm", duration:3.966, size:215529 },
+  { name:"gizmo.mp4", type:"video/mp4", duration:5.56, size:383631 },
   // A mp3 file with id3 tags.
-  { name: "id3tags.mp3", type: "audio/mpeg", duration: 0.28, size: 3530 },
-  { name: "bogus.duh", type: "bogus/duh" },
+  { name:"id3tags.mp3", type:"audio/mpeg", duration:0.28, size:3530},
+  { name:"bogus.duh", type:"bogus/duh" }
 ];
 
 // Files that contain resolution changes
 var gResolutionChangeTests = [
-  { name: "resolution-change.webm", type: "video/webm", duration: 6.533 },
+  { name:"resolution-change.webm", type:"video/webm", duration:6.533 },
 ];
 
 // Files we must reject as invalid.
 var gInvalidTests = [
-  { name: "invalid-m0c0.opus", type: "audio/ogg; codecs=opus" },
-  { name: "invalid-m0c3.opus", type: "audio/ogg; codecs=opus" },
-  { name: "invalid-m1c0.opus", type: "audio/ogg; codecs=opus" },
-  { name: "invalid-m1c9.opus", type: "audio/ogg; codecs=opus" },
-  { name: "invalid-m2c0.opus", type: "audio/ogg; codecs=opus" },
-  { name: "invalid-m2c1.opus", type: "audio/ogg; codecs=opus" },
-  { name: "invalid-cmap-short.opus", type: "audio/ogg; codecs=opus" },
-  { name: "invalid-cmap-s0c0.opus", type: "audio/ogg; codecs=opus" },
-  { name: "invalid-cmap-s0c2.opus", type: "audio/ogg; codecs=opus" },
-  { name: "invalid-cmap-s1c2.opus", type: "audio/ogg; codecs=opus" },
-  { name: "invalid-preskip.webm", type: "audio/webm; codecs=opus" },
+  { name:"invalid-m0c0.opus", type:"audio/ogg; codecs=opus"},
+  { name:"invalid-m0c3.opus", type:"audio/ogg; codecs=opus"},
+  { name:"invalid-m1c0.opus", type:"audio/ogg; codecs=opus"},
+  { name:"invalid-m1c9.opus", type:"audio/ogg; codecs=opus"},
+  { name:"invalid-m2c0.opus", type:"audio/ogg; codecs=opus"},
+  { name:"invalid-m2c1.opus", type:"audio/ogg; codecs=opus"},
+  { name:"invalid-cmap-short.opus", type:"audio/ogg; codecs=opus"},
+  { name:"invalid-cmap-s0c0.opus", type:"audio/ogg; codecs=opus"},
+  { name:"invalid-cmap-s0c2.opus", type:"audio/ogg; codecs=opus"},
+  { name:"invalid-cmap-s1c2.opus", type:"audio/ogg; codecs=opus"},
+  { name:"invalid-preskip.webm", type:"audio/webm; codecs=opus"},
 ];
 
 var gInvalidPlayTests = [
-  { name: "invalid-excess_discard.webm", type: "audio/webm; codecs=opus" },
-  { name: "invalid-excess_neg_discard.webm", type: "audio/webm; codecs=opus" },
-  { name: "invalid-neg_discard.webm", type: "audio/webm; codecs=opus" },
-  {
-    name: "invalid-discard_on_multi_blocks.webm",
-    type: "audio/webm; codecs=opus",
-  },
+  { name:"invalid-excess_discard.webm", type:"audio/webm; codecs=opus"},
+  { name:"invalid-excess_neg_discard.webm", type:"audio/webm; codecs=opus"},
+  { name:"invalid-neg_discard.webm", type:"audio/webm; codecs=opus"},
+  { name:"invalid-discard_on_multi_blocks.webm", type:"audio/webm; codecs=opus"},
 ];
 
 // Files to check different cases of ogg skeleton information.
@@ -639,60 +416,56 @@ var gInvalidPlayTests = [
 // audio-gaps-short.ogg
 // - No skeleton, but vorbis
 var gMultitrackInfoOggPlayList = [
-  { name: "sample-fisbone-skeleton4.ogv", type: "video/ogg", duration: 1.0 },
-  { name: "sample-fisbone-wrong-header.ogv", type: "video/ogg", duration: 1.0 },
-  {
-    name: "multiple-bos-more-header-fileds.ogg",
-    type: "video/ogg",
-    duration: 0.431,
-  },
-  { name: "seek-short.ogv", type: "video/ogg", duration: 1.03 },
-  { name: "audio-gaps-short.ogg", type: "audio/ogg", duration: 0.5 },
+  { name:"sample-fisbone-skeleton4.ogv", type:"video/ogg", duration:1.00 },
+  { name:"sample-fisbone-wrong-header.ogv", type:"video/ogg", duration:1.00 },
+  { name:"multiple-bos-more-header-fileds.ogg", type:"video/ogg", duration:0.431 },
+  { name:"seek-short.ogv", type:"video/ogg", duration:1.03 },
+  { name:"audio-gaps-short.ogg", type:"audio/ogg", duration:0.50 }
 ];
 // Pre-parsed results of gMultitrackInfoOggPlayList.
 var gOggTrackInfoResults = {
-  "sample-fisbone-skeleton4.ogv": {
-    audio_id: " audio_1",
-    audio_kind: "main",
-    audio_language: " en-US",
-    audio_label: " Audio track for test",
-    video_id: " video_1",
-    video_kind: "main",
-    video_language: " fr",
-    video_label: " Video track for test",
+  "sample-fisbone-skeleton4.ogv" : {
+    "audio_id":" audio_1",
+    "audio_kind":"main",
+    "audio_language":" en-US",
+    "audio_label":" Audio track for test",
+    "video_id":" video_1",
+    "video_kind":"main",
+    "video_language":" fr",
+    "video_label":" Video track for test"
   },
-  "sample-fisbone-wrong-header.ogv": {
-    audio_id: "1",
-    audio_kind: "main",
-    audio_language: "",
-    audio_label: "",
-    video_id: " video_1",
-    video_kind: "main",
-    video_language: " fr",
-    video_label: " Video track for test",
+  "sample-fisbone-wrong-header.ogv" : {
+    "audio_id":"1",
+    "audio_kind":"main",
+    "audio_language":"",
+    "audio_label":"",
+    "video_id":" video_1",
+    "video_kind":"main",
+    "video_language":" fr",
+    "video_label":" Video track for test"
   },
-  "multiple-bos-more-header-fileds.ogg": {
-    audio_id: "1",
-    audio_kind: "main",
-    audio_language: "",
-    audio_label: "",
-    video_id: "2",
-    video_kind: "main",
-    video_language: "",
-    video_label: "",
+  "multiple-bos-more-header-fileds.ogg" : {
+    "audio_id":"1",
+    "audio_kind":"main",
+    "audio_language":"",
+    "audio_label":"",
+    "video_id":"2",
+    "video_kind":"main",
+    "video_language":"",
+    "video_label":""
   },
-  "seek-short.ogv": {
-    video_id: "2",
-    video_kind: "main",
-    video_language: "",
-    video_label: "",
-  },
-  "audio-gaps-short.ogg": {
-    audio_id: "1",
-    audio_kind: "main",
-    audio_language: "",
-    audio_label: "",
+  "seek-short.ogv" : {
+    "video_id":"2",
+    "video_kind":"main",
+    "video_language":"",
+    "video_label":""
   },
+  "audio-gaps-short.ogg" : {
+    "audio_id":"1",
+    "audio_kind":"main",
+    "audio_language":"",
+    "audio_label":""
+  }
 };
 
 // Returns a promise that resolves to a function that converts
@@ -700,34 +473,34 @@ var gOggTrackInfoResults = {
 // Optionally checks whether the file actually exists on disk at the location
 // we've specified.
 function makeAbsolutePathConverter() {
-  const url = SimpleTest.getTestFileURL("chromeHelper.js");
+  const url = SimpleTest.getTestFileURL('chromeHelper.js');
   const script = SpecialPowers.loadChromeScript(url);
   return new Promise((resolve, reject) => {
-    script.addMessageListener("media-test:cwd", cwd => {
+    script.addMessageListener('media-test:cwd', cwd => {
       if (!cwd) {
-        ok(false, "Failed to find path to test files");
+	ok(false, "Failed to find path to test files");
       }
 
       resolve((path, mustExist) => {
-        // android mochitest doesn't support file://
-        if (manifestNavigator().appVersion.includes("Android")) {
-          return path;
-        }
+	// android mochitest doesn't support file://
+	if (manifestNavigator().appVersion.includes("Android"))
+	  return path;
 
-        const { Ci, Cc } = SpecialPowers;
-        var f = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsIFile);
-        f.initWithPath(cwd);
-        var split = path.split("/");
-        for (var i = 0; i < split.length; ++i) {
-          f.append(split[i]);
-        }
-        if (mustExist && !f.exists()) {
-          ok(false, "We expected '" + path + "' to exist, but it doesn't!");
-        }
-        return f.path;
+	const { Ci, Cc } = SpecialPowers;
+	var f = Cc["@mozilla.org/file/local;1"]
+            .createInstance(Ci.nsIFile);
+	f.initWithPath(cwd);
+	var split = path.split("/");
+	for(var i = 0; i < split.length; ++i) {
+	  f.append(split[i]);
+	}
+	if (mustExist && !f.exists()) {
+	  ok(false, "We expected '" + path + "' to exist, but it doesn't!");
+	}
+	return f.path;
       });
     });
-    script.sendAsyncMessage("media-test:getcwd");
+    script.sendAsyncMessage('media-test:getcwd');
   });
 }
 
@@ -750,57 +523,45 @@ function range_equals(r1, r2) {
 function makeInfoLeakTests() {
   return makeAbsolutePathConverter().then(fileUriToSrc => [
     {
-      type: "video/ogg",
+      type: 'video/ogg',
       src: fileUriToSrc("tests/dom/media/test/320x240.ogv", true),
-    },
-    {
-      type: "video/ogg",
+    },{
+      type: 'video/ogg',
       src: fileUriToSrc("tests/dom/media/test/404.ogv", false),
-    },
-    {
-      type: "audio/x-wav",
+    }, {
+      type: 'audio/x-wav',
       src: fileUriToSrc("tests/dom/media/test/r11025_s16_c1.wav", true),
-    },
-    {
-      type: "audio/x-wav",
+    }, {
+      type: 'audio/x-wav',
       src: fileUriToSrc("tests/dom/media/test/404.wav", false),
-    },
-    {
-      type: "audio/ogg",
+    }, {
+      type: 'audio/ogg',
       src: fileUriToSrc("tests/dom/media/test/bug461281.ogg", true),
-    },
-    {
-      type: "audio/ogg",
+    }, {
+      type: 'audio/ogg',
       src: fileUriToSrc("tests/dom/media/test/404.ogg", false),
-    },
-    {
-      type: "video/webm",
+    }, {
+      type: 'video/webm',
       src: fileUriToSrc("tests/dom/media/test/seek.webm", true),
-    },
-    {
-      type: "video/webm",
+    }, {
+      type: 'video/webm',
       src: fileUriToSrc("tests/dom/media/test/404.webm", false),
-    },
-    {
-      type: "video/ogg",
-      src: "http://localhost/404.ogv",
-    },
-    {
-      type: "audio/x-wav",
-      src: "http://localhost/404.wav",
-    },
-    {
-      type: "video/webm",
-      src: "http://localhost/404.webm",
-    },
-    {
-      type: "video/ogg",
-      src: "http://example.com/tests/dom/media/test/test_info_leak.html",
-    },
-    {
-      type: "audio/ogg",
-      src: "http://example.com/tests/dom/media/test/test_info_leak.html",
-    },
+    }, {
+      type: 'video/ogg',
+      src: 'http://localhost/404.ogv',
+    }, {
+      type: 'audio/x-wav',
+      src: 'http://localhost/404.wav',
+    }, {
+      type: 'video/webm',
+      src: 'http://localhost/404.webm',
+    }, {
+      type: 'video/ogg',
+      src: 'http://example.com/tests/dom/media/test/test_info_leak.html'
+    }, {
+      type: 'audio/ogg',
+      src: 'http://example.com/tests/dom/media/test/test_info_leak.html'
+    }
   ]);
 }
 
@@ -809,79 +570,71 @@ function makeInfoLeakTests() {
 // and no ended event. Put files of the same type together in this list so if
 // something crashes we have some idea of which backend is responsible.
 var gErrorTests = [
-  { name: "bogus.wav", type: "audio/x-wav" },
-  { name: "bogus.ogv", type: "video/ogg" },
-  { name: "448636.ogv", type: "video/ogg" },
-  { name: "bug504843.ogv", type: "video/ogg" },
-  { name: "bug501279.ogg", type: "audio/ogg" },
-  { name: "bug603918.webm", type: "video/webm" },
-  { name: "bug604067.webm", type: "video/webm" },
-  { name: "bogus.duh", type: "bogus/duh" },
+  { name:"bogus.wav", type:"audio/x-wav" },
+  { name:"bogus.ogv", type:"video/ogg" },
+  { name:"448636.ogv", type:"video/ogg" },
+  { name:"bug504843.ogv", type:"video/ogg" },
+  { name:"bug501279.ogg", type:"audio/ogg" },
+  { name:"bug603918.webm", type:"video/webm" },
+  { name:"bug604067.webm", type:"video/webm" },
+  { name:"bogus.duh", type:"bogus/duh" }
 ];
 
 // These files would get error after receiving "loadedmetadata", we would like
 // to check duration in "onerror" and make sure the duration is still available.
 var gDurationTests = [
-  { name: "bug603918.webm", duration: 6.076 },
-  { name: "bug604067.webm", duration: 6.076 },
-];
+  { name:"bug603918.webm", duration:6.076 },
+  { name:"bug604067.webm", duration:6.076 }
+]
 
 // These are files that have nontrivial duration and are useful for seeking within.
 var gSeekTests = [
-  { name: "r11025_s16_c1.wav", type: "audio/x-wav", duration: 1.0 },
-  { name: "audio.wav", type: "audio/x-wav", duration: 0.031247 },
-  { name: "seek.ogv", type: "video/ogg", duration: 3.966 },
-  { name: "320x240.ogv", type: "video/ogg", duration: 0.266 },
-  { name: "seek.webm", type: "video/webm", duration: 3.966 },
-  { name: "sine.webm", type: "audio/webm", duration: 4.001 },
-  { name: "bug516323.indexed.ogv", type: "video/ogg", duration: 4.208333 },
-  { name: "split.webm", type: "video/webm", duration: 1.967 },
-  { name: "detodos.opus", type: "audio/ogg; codecs=opus", duration: 2.9135 },
-  { name: "gizmo.mp4", type: "video/mp4", duration: 5.56 },
-  { name: "owl.mp3", type: "audio/mpeg", duration: 3.343 },
-  { name: "bogus.duh", type: "bogus/duh", duration: 123 },
+  { name:"r11025_s16_c1.wav", type:"audio/x-wav", duration:1.0 },
+  { name:"audio.wav", type:"audio/x-wav", duration:0.031247 },
+  { name:"seek.ogv", type:"video/ogg", duration:3.966 },
+  { name:"320x240.ogv", type:"video/ogg", duration:0.266 },
+  { name:"seek.webm", type:"video/webm", duration:3.966 },
+  { name:"sine.webm", type:"audio/webm", duration:4.001 },
+  { name:"bug516323.indexed.ogv", type:"video/ogg", duration:4.208333 },
+  { name:"split.webm", type:"video/webm", duration:1.967 },
+  { name:"detodos.opus", type:"audio/ogg; codecs=opus", duration:2.9135 },
+  { name:"gizmo.mp4", type:"video/mp4", duration:5.56 },
+  { name:"owl.mp3", type:"audio/mpeg", duration:3.343 },
+  { name:"bogus.duh", type:"bogus/duh", duration:123 },
 
   // Bug 1242338: hit a numerical problem while seeking to the duration.
-  { name: "bug482461-theora.ogv", type: "video/ogg", duration: 4.138 },
+  { name:"bug482461-theora.ogv", type:"video/ogg", duration:4.138 },
 ];
 
 var gFastSeekTests = [
-  {
-    name: "gizmo.mp4",
-    type: "video/mp4",
-    keyframes: [0, 1.0, 2.0, 3.0, 4.0, 5.0],
-  },
+  { name:"gizmo.mp4", type:"video/mp4", keyframes:[0, 1.0, 2.0, 3.0, 4.0, 5.0 ] },
   // Note: Not all keyframes in the file are actually referenced in the Cues in this file.
-  { name: "seek.webm", type: "video/webm", keyframes: [0, 0.8, 1.6, 2.4, 3.2] },
+  { name:"seek.webm", type:"video/webm", keyframes:[0, 0.8, 1.6, 2.4, 3.2]},
   // Note: the sync points are the points on both the audio and video streams
   // before the keyframes. You can't just assume that the keyframes are the sync
   // points, as the audio required for that sync point may be before the keyframe.
-  {
-    name: "bug516323.indexed.ogv",
-    type: "video/ogg",
-    keyframes: [0, 0.46, 3.06],
-  },
+  { name:"bug516323.indexed.ogv", type:"video/ogg", keyframes:[0, 0.46, 3.06] },
 ];
 
 // These files are WebMs without cues. They're seekable within their buffered
 // ranges. If work renders WebMs fully seekable these files should be moved
 // into gSeekTests
 var gCuelessWebMTests = [
-  { name: "no-cues.webm", type: "video/webm", duration: 3.967 },
+  { name:"no-cues.webm", type:"video/webm", duration:3.967 },
 ];
 
 // These are files that are non seekable, due to problems with the media,
 // for example broken or missing indexes.
-var gUnseekableTests = [{ name: "bogus.duh", type: "bogus/duh" }];
+var gUnseekableTests = [
+  { name:"bogus.duh", type:"bogus/duh"}
+];
 
 var androidVersion = -1; // non-Android platforms
-if (
-  manifestNavigator().userAgent.includes("Mobile") ||
-  manifestNavigator().userAgent.includes("Tablet")
-) {
-  androidVersion = SpecialPowers.Cc["@mozilla.org/system-info;1"]
-    .getService(SpecialPowers.Ci.nsIPropertyBag2)
-    .getProperty("version");
+if (manifestNavigator().userAgent.includes("Mobile") ||
+    manifestNavigator().userAgent.includes("Tablet")) {
+  androidVersion = SpecialPowers.Cc['@mozilla.org/system-info;1']
+                                .getService(SpecialPowers.Ci.nsIPropertyBag2)
+                                .getProperty('version');
 }
 
 function getAndroidVersion() {
@@ -890,22 +643,22 @@ function getAndroidVersion() {
 
 // These are files suitable for using with a "new Audio" constructor.
 var gAudioTests = [
-  { name: "r11025_s16_c1.wav", type: "audio/x-wav", duration: 1.0 },
-  { name: "sound.ogg", type: "audio/ogg" },
-  { name: "owl.mp3", type: "audio/mpeg", duration: 3.343 },
-  { name: "small-shot.m4a", type: "audio/mp4", duration: 0.29 },
-  { name: "bogus.duh", type: "bogus/duh", duration: 123 },
-  { name: "empty_size.mp3", type: "audio/mpeg", duration: 2.235 },
+  { name:"r11025_s16_c1.wav", type:"audio/x-wav", duration:1.0 },
+  { name:"sound.ogg", type:"audio/ogg" },
+  { name:"owl.mp3", type:"audio/mpeg", duration:3.343 },
+  { name:"small-shot.m4a", type:"audio/mp4", duration:0.29 },
+  { name:"bogus.duh", type:"bogus/duh", duration:123 },
+  { name:"empty_size.mp3", type:"audio/mpeg", duration: 2.235 }
 ];
 
 // These files ensure our handling of 404 errors is consistent across the
 // various backends.
 var g404Tests = [
-  { name: "404.wav", type: "audio/x-wav" },
-  { name: "404.ogv", type: "video/ogg" },
-  { name: "404.oga", type: "audio/ogg" },
-  { name: "404.webm", type: "video/webm" },
-  { name: "bogus.duh", type: "bogus/duh" },
+  { name:"404.wav", type:"audio/x-wav" },
+  { name:"404.ogv", type:"video/ogg" },
+  { name:"404.oga", type:"audio/ogg" },
+  { name:"404.webm", type:"video/webm" },
+  { name:"bogus.duh", type:"bogus/duh" }
 ];
 
 // These are files suitable for testing various decoder failures that are
@@ -913,18 +666,18 @@ var g404Tests = [
 // an error and emptied event, and no loadedmetadata or ended event.
 var gDecodeErrorTests = [
   // Valid files with unsupported codecs
-  { name: "r11025_msadpcm_c1.wav", type: "audio/x-wav" },
-  { name: "dirac.ogg", type: "video/ogg" },
+  { name:"r11025_msadpcm_c1.wav", type:"audio/x-wav" },
+  { name:"dirac.ogg", type:"video/ogg" },
   // Invalid files
-  { name: "bogus.wav", type: "audio/x-wav" },
-  { name: "bogus.ogv", type: "video/ogg" },
+  { name:"bogus.wav", type:"audio/x-wav" },
+  { name:"bogus.ogv", type:"video/ogg" },
 
-  { name: "bogus.duh", type: "bogus/duh" },
+  { name:"bogus.duh", type:"bogus/duh" }
 ];
 
 // These are files that are used for media fragments tests
 var gFragmentTests = [
-  { name: "big.wav", type: "audio/x-wav", duration: 9.278982, size: 102444 },
+  { name:"big.wav", type:"audio/x-wav", duration:9.278982, size:102444 }
 ];
 
 // Used by test_chaining.html. The |links| attributes is the number of links in
@@ -932,809 +685,750 @@ var gFragmentTests = [
 var gChainingTests = [
   // Vorbis and Opus chained file. They have user comments |index=n| where `n`
   // is the index of this segment in the file, 0 indexed.
-  { name: "chain.ogg", type: "audio/ogg", links: 4 },
-  { name: "chain.opus", type: "audio/ogg; codec=opus", links: 4 },
+  { name:"chain.ogg", type:"audio/ogg", links: 4},
+  { name:"chain.opus", type:"audio/ogg; codec=opus", links: 4},
   // Those files are chained files with a different number of channels in each
   // part. This is not supported and should stop playing after the first part.
-  { name: "variable-channel.ogg", type: "audio/ogg", links: 1 },
-  { name: "variable-channel.opus", type: "audio/ogg; codec=opus", links: 1 },
+  { name:"variable-channel.ogg", type:"audio/ogg", links: 1 },
+  { name:"variable-channel.opus", type:"audio/ogg; codec=opus", links: 1 },
   // Those files are chained files with a different sample rate in each
   // part. This is not supported and should stop playing after the first part.
-  { name: "variable-samplerate.ogg", type: "audio/ogg", links: 1 },
+  { name:"variable-samplerate.ogg", type:"audio/ogg", links: 1 },
   // Opus decoding in Firefox outputs 48 kHz PCM despite having a different
   // original sample rate, so we can safely play Opus chained media that have
   // different samplerate accross links.
-  { name: "variable-samplerate.opus", type: "audio/ogg; codec=opus", links: 2 },
+  { name:"variable-samplerate.opus", type:"audio/ogg; codec=opus", links: 2 },
   // A chained video file. We don't support those, so only one link should be
   // reported.
-  { name: "chained-video.ogv", type: "video/ogg", links: 1 },
+  { name:"chained-video.ogv", type:"video/ogg", links: 1 },
   // A file that consist in 4 links of audio, then another link that has video.
   // We should stop right after the 4 audio links.
-  { name: "chained-audio-video.ogg", type: "video/ogg", links: 4 },
+  { name:"chained-audio-video.ogg", type:"video/ogg", links: 4 },
   // An opus file that has two links, with a different preskip value for each
   // link. We should be able to play both links.
-  { name: "variable-preskip.opus", type: "audio/ogg; codec=opus", links: 2 },
-  { name: "bogus.duh", type: "bogus/duh" },
+  { name:"variable-preskip.opus", type:"audio/ogg; codec=opus", links: 2 },
+  { name:"bogus.duh", type:"bogus/duh" }
 ];
 
 // Videos with an aspect ratio. Used for testing that displaying frames
 // on a canvas works correctly in the case of non-standard aspect ratios.
 // See bug 874897 for an example.
 var gAspectRatioTests = [
-  { name: "VID_0001.ogg", type: "video/ogg", duration: 19.966 },
+  { name:"VID_0001.ogg", type:"video/ogg", duration:19.966 }
 ];
 
 // These are files with non-trivial tag sets.
 // Used by test_metadata.html.
 var gMetadataTests = [
   // Ogg Vorbis files
-  {
-    name: "short-video.ogv",
-    tags: {
-      TITLE: "Lepidoptera",
-      ARTIST: "Epoq",
-      ALBUM: "Kahvi Collective",
-      DATE: "2002",
-      COMMENT: "http://www.kahvi.org",
-    },
+  { name:"short-video.ogv", tags: {
+      TITLE:"Lepidoptera",
+      ARTIST:"Epoq",
+      ALBUM:"Kahvi Collective",
+      DATE:"2002",
+      COMMENT:"http://www.kahvi.org",
+    }
   },
-  {
-    name: "bug516323.ogv",
-    tags: {
-      GENRE: "Open Movie",
-      ENCODER: "Audacity",
-      TITLE: "Elephants Dream",
-      ARTIST: "Silvia Pfeiffer",
-      COMMENTS: "Audio Description",
-    },
+  { name:"bug516323.ogv", tags: {
+      GENRE:"Open Movie",
+      ENCODER:"Audacity",
+      TITLE:"Elephants Dream",
+      ARTIST:"Silvia Pfeiffer",
+      COMMENTS:"Audio Description"
+    }
   },
-  {
-    name: "bug516323.indexed.ogv",
-    tags: {
-      GENRE: "Open Movie",
-      ENCODER: "Audacity",
-      TITLE: "Elephants Dream",
-      ARTIST: "Silvia Pfeiffer",
-      COMMENTS: "Audio Description",
-    },
+  { name:"bug516323.indexed.ogv", tags: {
+      GENRE:"Open Movie",
+      ENCODER:"Audacity",
+      TITLE:"Elephants Dream",
+      ARTIST:"Silvia Pfeiffer",
+      COMMENTS:"Audio Description"
+    }
   },
-  {
-    name: "detodos.opus",
-    tags: {
-      title: "De todos. Para todos.",
-      artist: "Mozilla.org",
-    },
+  { name:"detodos.opus", tags: {
+      title:"De todos. Para todos.",
+      artist:"Mozilla.org"
+    }
   },
-  { name: "sound.ogg", tags: {} },
-  {
-    name: "small-shot.ogg",
-    tags: {
-      title: "Pew SFX",
-    },
+  { name:"sound.ogg", tags: { } },
+  { name:"small-shot.ogg", tags: {
+      title:"Pew SFX"
+    }
   },
-  {
-    name: "badtags.ogg",
-    tags: {
+  { name:"badtags.ogg", tags: {
       // We list only the valid tags here, and verify
       // the invalid ones are filtered out.
-      title: "Invalid comments test file",
-      empty: "",
-      "": "empty",
-      "{- [(`!@\"#$%^&')] -}": "valid tag name, surprisingly",
+      title:"Invalid comments test file",
+      empty:"",
+      "":"empty",
+      "{- [(`!@\"#$%^&')] -}":"valid tag name, surprisingly"
       // The file also includes the following invalid tags.
       // "A description with no separator is a common problem.",
       // "雨":"Likely, but an invalid key (non-ascii).",
       // "not\nval\x1fid":"invalid tag name",
       // "not~valid":"this isn't a valid name either",
       // "not-utf-8":"invalid sequences: \xff\xfe\xfa\xfb\0eol"
-    },
+    }
   },
-  {
-    name: "wave_metadata.wav",
-    tags: {
-      name: "Track Title",
-      artist: "Artist Name",
-      comments: "Comments",
-    },
+  { name:"wave_metadata.wav", tags: {
+      name:"Track Title",
+      artist:"Artist Name",
+      comments:"Comments",
+    }
   },
-  {
-    name: "wave_metadata_utf8.wav",
-    tags: {
-      name: "歌曲名稱",
-      artist: "作曲者",
-      comments: "註解",
-    },
+  { name:"wave_metadata_utf8.wav", tags: {
+      name:"歌曲名稱",
+      artist:"作曲者",
+      comments:"註解",
+    }
   },
-  {
-    name: "wave_metadata_unknown_tag.wav",
-    tags: {
-      name: "Track Title",
-      comments: "Comments",
-    },
+  { name:"wave_metadata_unknown_tag.wav", tags: {
+      name:"Track Title",
+      comments:"Comments",
+    }
   },
-  {
-    name: "wave_metadata_bad_len.wav",
-    tags: {
-      name: "Track Title",
-      artist: "Artist Name",
-      comments: "Comments",
-    },
+  { name:"wave_metadata_bad_len.wav", tags: {
+      name:"Track Title",
+      artist:"Artist Name",
+      comments:"Comments",
+    }
   },
-  {
-    name: "wave_metadata_bad_no_null.wav",
-    tags: {
-      name: "Track Title",
-      artist: "Artist Name",
-      comments: "Comments!!",
-    },
+  { name:"wave_metadata_bad_no_null.wav", tags: {
+      name:"Track Title",
+      artist:"Artist Name",
+      comments:"Comments!!",
+    }
   },
-  {
-    name: "wave_metadata_bad_utf8.wav",
-    tags: {
-      name: "歌曲名稱",
-      comments: "註解",
-    },
+  { name:"wave_metadata_bad_utf8.wav", tags: {
+      name:"歌曲名稱",
+      comments:"註解",
+    }
+  },
+  { name:"wavedata_u8.wav", tags: { }
   },
-  { name: "wavedata_u8.wav", tags: {} },
 ];
 
 // Now Fennec doesn't support flac, so only test it on non-android platforms.
 if (getAndroidVersion() < 0) {
   gMetadataTests = gMetadataTests.concat([
-    {
-      name: "flac-s24.flac",
-      tags: {
-        ALBUM: "Seascapes",
-        TITLE: "(La Mer) - II. Jeux de vagues. Allegro",
-        COMPOSER: "Debussy, Claude",
-        TRACKNUMBER: "2/9",
-        DISCNUMBER: "1/1",
-        encoder: "Lavf57.41.100",
-      },
-    },
-  ]);
+    { name:"flac-s24.flac", tags: {
+        ALBUM:"Seascapes",
+        TITLE:"(La Mer) - II. Jeux de vagues. Allegro",
+        COMPOSER:"Debussy, Claude",
+        TRACKNUMBER:"2/9",
+        DISCNUMBER:"1/1",
+        encoder:"Lavf57.41.100",
+      }
+    }]);
 }
 
 // Test files for Encrypted Media Extensions
 var gEMETests = [
   {
-    name: "vp9 in mp4",
+    name:"vp9 in mp4",
     tracks: [
       {
-        name: "video",
-        type: 'video/mp4; codecs="vp9.0"',
-        fragments: ["short-vp9-encrypted-video.mp4"],
+          name:"video",
+          type:"video/mp4; codecs=\"vp9.0\"",
+          fragments:[ "short-vp9-encrypted-video.mp4",
+                    ]
       },
       {
-        name: "audio",
-        type: 'audio/mp4; codecs="mp4a.40.2"',
-        fragments: ["short-aac-encrypted-audio.mp4"],
-      },
+          name:"audio",
+          type:"audio/mp4; codecs=\"mp4a.40.2\"",
+          fragments:[ "short-aac-encrypted-audio.mp4",
+                    ]
+      }
     ],
     keys: {
-      "2cdb0ed6119853e7850671c3e9906c3c": "808B9ADAC384DE1E4F56140F4AD76194",
+      "2cdb0ed6119853e7850671c3e9906c3c":"808B9ADAC384DE1E4F56140F4AD76194"
     },
-    sessionType: "temporary",
-    sessionCount: 2,
-    duration: 0.47,
+    sessionType:"temporary",
+    sessionCount:2,
+    duration:0.47
   },
   {
-    name: "video-only with 2 keys",
+    name:"video-only with 2 keys",
     tracks: [
       {
-        name: "video",
-        type: 'video/mp4; codecs="avc1.64000d"',
-        fragments: [
-          "bipbop-cenc-videoinit.mp4",
-          "bipbop-cenc-video1.m4s",
-          "bipbop-cenc-video2.m4s",
-        ],
+        name:"video",
+        type:"video/mp4; codecs=\"avc1.64000d\"",
+        fragments:[ "bipbop-cenc-videoinit.mp4",
+                    "bipbop-cenc-video1.m4s",
+                    "bipbop-cenc-video2.m4s",
+                  ]
+      }
+    ],
+    keys: {
+      // "keyid" : "key"
+      "7e571d037e571d037e571d037e571d03" : "7e5733337e5733337e5733337e573333",
+      "7e571d047e571d047e571d047e571d04" : "7e5744447e5744447e5744447e574444",
+    },
+    sessionType:"temporary",
+    sessionCount:1,
+    duration:1.60,
+  },
+  {
+    name:"video-only with 2 keys, CORS",
+    tracks: [
+      {
+        name:"video",
+        type:"video/mp4; codecs=\"avc1.64000d\"",
+        fragments:[ "bipbop-cenc-videoinit.mp4",
+                    "bipbop-cenc-video1.m4s",
+                    "bipbop-cenc-video2.m4s",
+                  ]
+      }
+    ],
+    keys: {
+      // "keyid" : "key"
+      "7e571d037e571d037e571d037e571d03" : "7e5733337e5733337e5733337e573333",
+      "7e571d047e571d047e571d047e571d04" : "7e5744447e5744447e5744447e574444",
+    },
+    sessionType:"temporary",
+    sessionCount:1,
+    crossOrigin:true,
+    duration:1.60,
+  },
+  {
+    name:"audio&video tracks, both with all keys",
+    tracks: [
+      {
+        name:"audio",
+        type:"audio/mp4; codecs=\"mp4a.40.2\"",
+        fragments:[ "bipbop-cenc-audioinit.mp4",
+                    "bipbop-cenc-audio1.m4s",
+                    "bipbop-cenc-audio2.m4s",
+                    "bipbop-cenc-audio3.m4s",
+                  ],
+      },
+      {
+        name:"video",
+        type:"video/mp4; codecs=\"avc1.64000d\"",
+        fragments:[ "bipbop-cenc-videoinit.mp4",
+                    "bipbop-cenc-video1.m4s",
+                    "bipbop-cenc-video2.m4s",
+                  ],
       },
     ],
     keys: {
       // "keyid" : "key"
-      "7e571d037e571d037e571d037e571d03": "7e5733337e5733337e5733337e573333",
-      "7e571d047e571d047e571d047e571d04": "7e5744447e5744447e5744447e574444",
+      "7e571d037e571d037e571d037e571d03" : "7e5733337e5733337e5733337e573333",
+      "7e571d047e571d047e571d047e571d04" : "7e5744447e5744447e5744447e574444",
     },
-    sessionType: "temporary",
-    sessionCount: 1,
-    duration: 1.6,
+    sessionType:"temporary",
+    sessionCount:2,
+    duration:1.60,
   },
   {
-    name: "video-only with 2 keys, CORS",
+    name:"audio&video tracks, both with all keys, CORS",
     tracks: [
       {
-        name: "video",
-        type: 'video/mp4; codecs="avc1.64000d"',
-        fragments: [
-          "bipbop-cenc-videoinit.mp4",
-          "bipbop-cenc-video1.m4s",
-          "bipbop-cenc-video2.m4s",
-        ],
+        name:"audio",
+        type:"audio/mp4; codecs=\"mp4a.40.2\"",
+        fragments:[ "bipbop-cenc-audioinit.mp4",
+                    "bipbop-cenc-audio1.m4s",
+                    "bipbop-cenc-audio2.m4s",
+                    "bipbop-cenc-audio3.m4s",
+                  ],
+      },
+      {
+        name:"video",
+        type:"video/mp4; codecs=\"avc1.64000d\"",
+        fragments:[ "bipbop-cenc-videoinit.mp4",
+                    "bipbop-cenc-video1.m4s",
+                    "bipbop-cenc-video2.m4s",
+                  ],
       },
     ],
     keys: {
       // "keyid" : "key"
-      "7e571d037e571d037e571d037e571d03": "7e5733337e5733337e5733337e573333",
-      "7e571d047e571d047e571d047e571d04": "7e5744447e5744447e5744447e574444",
+      "7e571d037e571d037e571d037e571d03" : "7e5733337e5733337e5733337e573333",
+      "7e571d047e571d047e571d047e571d04" : "7e5744447e5744447e5744447e574444",
     },
-    sessionType: "temporary",
-    sessionCount: 1,
-    crossOrigin: true,
-    duration: 1.6,
+    sessionType:"temporary",
+    sessionCount:2,
+    crossOrigin:true,
+    duration:1.60,
   },
   {
-    name: "audio&video tracks, both with all keys",
+    name:"400x300 audio&video tracks, each with its key",
     tracks: [
       {
-        name: "audio",
-        type: 'audio/mp4; codecs="mp4a.40.2"',
-        fragments: [
-          "bipbop-cenc-audioinit.mp4",
-          "bipbop-cenc-audio1.m4s",
-          "bipbop-cenc-audio2.m4s",
-          "bipbop-cenc-audio3.m4s",
-        ],
+        name:"audio",
+        type:"audio/mp4; codecs=\"mp4a.40.2\"",
+        fragments:[ "bipbop_300_215kbps-cenc-audio-key1-init.mp4",
+                    "bipbop_300_215kbps-cenc-audio-key1-1.m4s",
+                    "bipbop_300_215kbps-cenc-audio-key1-2.m4s",
+                    "bipbop_300_215kbps-cenc-audio-key1-3.m4s",
+                    "bipbop_300_215kbps-cenc-audio-key1-4.m4s",
+                  ],
       },
       {
-        name: "video",
-        type: 'video/mp4; codecs="avc1.64000d"',
-        fragments: [
-          "bipbop-cenc-videoinit.mp4",
-          "bipbop-cenc-video1.m4s",
-          "bipbop-cenc-video2.m4s",
-        ],
+        name:"video",
+        type:"video/mp4; codecs=\"avc1.64000d\"",
+        fragments:[ "bipbop_300_215kbps-cenc-video-key1-init.mp4",
+                    "bipbop_300_215kbps-cenc-video-key1-1.m4s",
+                    "bipbop_300_215kbps-cenc-video-key1-2.m4s",
+                  ],
       },
     ],
     keys: {
       // "keyid" : "key"
-      "7e571d037e571d037e571d037e571d03": "7e5733337e5733337e5733337e573333",
-      "7e571d047e571d047e571d047e571d04": "7e5744447e5744447e5744447e574444",
+      "7e571d037e571d037e571d037e571d11" : "7e5733337e5733337e5733337e573311",
+      "7e571d047e571d047e571d047e571d21" : "7e5744447e5744447e5744447e574421",
     },
-    sessionType: "temporary",
-    sessionCount: 2,
-    duration: 1.6,
+    sessionType:"temporary",
+    sessionCount:2,
+    duration:1.60,
   },
   {
-    name: "audio&video tracks, both with all keys, CORS",
+    name:"640x480@624kbps audio&video tracks, each with its key",
     tracks: [
       {
-        name: "audio",
-        type: 'audio/mp4; codecs="mp4a.40.2"',
-        fragments: [
-          "bipbop-cenc-audioinit.mp4",
-          "bipbop-cenc-audio1.m4s",
-          "bipbop-cenc-audio2.m4s",
-          "bipbop-cenc-audio3.m4s",
-        ],
+        name:"audio",
+        type:"audio/mp4; codecs=\"mp4a.40.2\"",
+        fragments:[ "bipbop_480_624kbps-cenc-audio-key1-init.mp4",
+                    "bipbop_480_624kbps-cenc-audio-key1-1.m4s",
+                    "bipbop_480_624kbps-cenc-audio-key1-2.m4s",
+                    "bipbop_480_624kbps-cenc-audio-key1-3.m4s",
+                    "bipbop_480_624kbps-cenc-audio-key1-4.m4s",
+                  ],
       },
       {
-        name: "video",
-        type: 'video/mp4; codecs="avc1.64000d"',
-        fragments: [
-          "bipbop-cenc-videoinit.mp4",
-          "bipbop-cenc-video1.m4s",
-          "bipbop-cenc-video2.m4s",
-        ],
+        name:"video",
+        type:"video/mp4; codecs=\"avc1.64000d\"",
+        fragments:[ "bipbop_480_624kbps-cenc-video-key1-init.mp4",
+                    "bipbop_480_624kbps-cenc-video-key1-1.m4s",
+                    "bipbop_480_624kbps-cenc-video-key1-2.m4s",
+                  ],
       },
     ],
     keys: {
       // "keyid" : "key"
-      "7e571d037e571d037e571d037e571d03": "7e5733337e5733337e5733337e573333",
-      "7e571d047e571d047e571d047e571d04": "7e5744447e5744447e5744447e574444",
+      "7e571d037e571d037e571d037e571d11" : "7e5733337e5733337e5733337e573311",
+      "7e571d047e571d047e571d047e571d21" : "7e5744447e5744447e5744447e574421",
     },
-    sessionType: "temporary",
-    sessionCount: 2,
-    crossOrigin: true,
-    duration: 1.6,
+    sessionType:"temporary",
+    sessionCount:2,
+    duration:1.60,
   },
   {
-    name: "400x300 audio&video tracks, each with its key",
+    name:"640x480@959kbps audio&video tracks, each with its key",
     tracks: [
       {
-        name: "audio",
-        type: 'audio/mp4; codecs="mp4a.40.2"',
-        fragments: [
-          "bipbop_300_215kbps-cenc-audio-key1-init.mp4",
-          "bipbop_300_215kbps-cenc-audio-key1-1.m4s",
-          "bipbop_300_215kbps-cenc-audio-key1-2.m4s",
-          "bipbop_300_215kbps-cenc-audio-key1-3.m4s",
-          "bipbop_300_215kbps-cenc-audio-key1-4.m4s",
-        ],
+        name:"audio",
+        type:"audio/mp4; codecs=\"mp4a.40.2\"",
+        fragments:[ "bipbop_480_959kbps-cenc-audio-key1-init.mp4",
+                    "bipbop_480_959kbps-cenc-audio-key1-1.m4s",
+                    "bipbop_480_959kbps-cenc-audio-key1-2.m4s",
+                    "bipbop_480_959kbps-cenc-audio-key1-3.m4s",
+                    "bipbop_480_959kbps-cenc-audio-key1-4.m4s",
+                  ],
       },
       {
-        name: "video",
-        type: 'video/mp4; codecs="avc1.64000d"',
-        fragments: [
-          "bipbop_300_215kbps-cenc-video-key1-init.mp4",
-          "bipbop_300_215kbps-cenc-video-key1-1.m4s",
-          "bipbop_300_215kbps-cenc-video-key1-2.m4s",
-        ],
+        name:"video",
+        type:"video/mp4; codecs=\"avc1.64000d\"",
+        fragments:[ "bipbop_480_959kbps-cenc-video-key1-init.mp4",
+                    "bipbop_480_959kbps-cenc-video-key1-1.m4s",
+                    "bipbop_480_959kbps-cenc-video-key1-2.m4s",
+                  ],
       },
     ],
     keys: {
       // "keyid" : "key"
-      "7e571d037e571d037e571d037e571d11": "7e5733337e5733337e5733337e573311",
-      "7e571d047e571d047e571d047e571d21": "7e5744447e5744447e5744447e574421",
+      "7e571d037e571d037e571d037e571d11" : "7e5733337e5733337e5733337e573311",
+      "7e571d047e571d047e571d047e571d21" : "7e5744447e5744447e5744447e574421",
     },
-    sessionType: "temporary",
-    sessionCount: 2,
-    duration: 1.6,
+    sessionType:"temporary",
+    sessionCount:2,
+    duration:1.60,
   },
   {
-    name: "640x480@624kbps audio&video tracks, each with its key",
+    name:"640x480 then 400x300, same key (1st) per track",
     tracks: [
       {
-        name: "audio",
-        type: 'audio/mp4; codecs="mp4a.40.2"',
-        fragments: [
-          "bipbop_480_624kbps-cenc-audio-key1-init.mp4",
-          "bipbop_480_624kbps-cenc-audio-key1-1.m4s",
-          "bipbop_480_624kbps-cenc-audio-key1-2.m4s",
-          "bipbop_480_624kbps-cenc-audio-key1-3.m4s",
-          "bipbop_480_624kbps-cenc-audio-key1-4.m4s",
-        ],
+        name:"audio",
+        type:"audio/mp4; codecs=\"mp4a.40.2\"",
+        fragments:[ "bipbop_480_624kbps-cenc-audio-key1-init.mp4",
+                    "bipbop_480_624kbps-cenc-audio-key1-1.m4s",
+                    "bipbop_480_624kbps-cenc-audio-key1-2.m4s",
+                    "bipbop_480_624kbps-cenc-audio-key1-3.m4s",
+                    "bipbop_480_624kbps-cenc-audio-key1-4.m4s",
+                  ],
       },
       {
-        name: "video",
-        type: 'video/mp4; codecs="avc1.64000d"',
-        fragments: [
-          "bipbop_480_624kbps-cenc-video-key1-init.mp4",
-          "bipbop_480_624kbps-cenc-video-key1-1.m4s",
-          "bipbop_480_624kbps-cenc-video-key1-2.m4s",
-        ],
+        name:"video",
+        type:"video/mp4; codecs=\"avc1.64000d\"",
+        fragments:[ "bipbop_480_624kbps-cenc-video-key1-init.mp4",
+                    "bipbop_480_624kbps-cenc-video-key1-1.m4s",
+                    "bipbop_300_215kbps-cenc-video-key1-init.mp4",
+                    "bipbop_300_215kbps-cenc-video-key1-2.m4s",
+                  ],
       },
     ],
     keys: {
       // "keyid" : "key"
-      "7e571d037e571d037e571d037e571d11": "7e5733337e5733337e5733337e573311",
-      "7e571d047e571d047e571d047e571d21": "7e5744447e5744447e5744447e574421",
+      "7e571d037e571d037e571d037e571d11" : "7e5733337e5733337e5733337e573311",
+      "7e571d047e571d047e571d047e571d21" : "7e5744447e5744447e5744447e574421",
     },
-    sessionType: "temporary",
-    sessionCount: 2,
-    duration: 1.6,
+    sessionType:"temporary",
+    sessionCount:3,
+    duration:1.60,
   },
   {
-    name: "640x480@959kbps audio&video tracks, each with its key",
+    name:"640x480 then 400x300, same key (2nd) per track",
     tracks: [
       {
-        name: "audio",
-        type: 'audio/mp4; codecs="mp4a.40.2"',
-        fragments: [
-          "bipbop_480_959kbps-cenc-audio-key1-init.mp4",
-          "bipbop_480_959kbps-cenc-audio-key1-1.m4s",
-          "bipbop_480_959kbps-cenc-audio-key1-2.m4s",
-          "bipbop_480_959kbps-cenc-audio-key1-3.m4s",
-          "bipbop_480_959kbps-cenc-audio-key1-4.m4s",
-        ],
+        name:"audio",
+        type:"audio/mp4; codecs=\"mp4a.40.2\"",
+        fragments:[ "bipbop_480_624kbps-cenc-audio-key2-init.mp4",
+                    "bipbop_480_624kbps-cenc-audio-key2-1.m4s",
+                    "bipbop_480_624kbps-cenc-audio-key2-2.m4s",
+                    "bipbop_480_624kbps-cenc-audio-key2-3.m4s",
+                    "bipbop_480_624kbps-cenc-audio-key2-4.m4s",
+                  ],
       },
       {
-        name: "video",
-        type: 'video/mp4; codecs="avc1.64000d"',
-        fragments: [
-          "bipbop_480_959kbps-cenc-video-key1-init.mp4",
-          "bipbop_480_959kbps-cenc-video-key1-1.m4s",
-          "bipbop_480_959kbps-cenc-video-key1-2.m4s",
-        ],
+        name:"video",
+        type:"video/mp4; codecs=\"avc1.64000d\"",
+        fragments:[ "bipbop_480_624kbps-cenc-video-key2-init.mp4",
+                    "bipbop_480_624kbps-cenc-video-key2-1.m4s",
+                    "bipbop_300_215kbps-cenc-video-key2-init.mp4",
+                    "bipbop_300_215kbps-cenc-video-key2-2.m4s",
+                  ],
       },
     ],
     keys: {
       // "keyid" : "key"
-      "7e571d037e571d037e571d037e571d11": "7e5733337e5733337e5733337e573311",
-      "7e571d047e571d047e571d047e571d21": "7e5744447e5744447e5744447e574421",
+      "7e571d037e571d037e571d037e571d12" : "7e5733337e5733337e5733337e573312",
+      "7e571d047e571d047e571d047e571d22" : "7e5744447e5744447e5744447e574422",
     },
-    sessionType: "temporary",
-    sessionCount: 2,
-    duration: 1.6,
+    sessionType:"temporary",
+    sessionCount:3,
+    duration:1.60,
   },
   {
-    name: "640x480 then 400x300, same key (1st) per track",
+    name:"640x480 with 1st keys then 400x300 with 2nd keys",
     tracks: [
       {
-        name: "audio",
-        type: 'audio/mp4; codecs="mp4a.40.2"',
-        fragments: [
-          "bipbop_480_624kbps-cenc-audio-key1-init.mp4",
-          "bipbop_480_624kbps-cenc-audio-key1-1.m4s",
-          "bipbop_480_624kbps-cenc-audio-key1-2.m4s",
-          "bipbop_480_624kbps-cenc-audio-key1-3.m4s",
-          "bipbop_480_624kbps-cenc-audio-key1-4.m4s",
-        ],
+        name:"audio",
+        type:"audio/mp4; codecs=\"mp4a.40.2\"",
+        fragments:[ "bipbop_480_624kbps-cenc-audio-key1-init.mp4",
+                    "bipbop_480_624kbps-cenc-audio-key1-1.m4s",
+                    "bipbop_480_624kbps-cenc-audio-key1-2.m4s",
+                    "bipbop_480_624kbps-cenc-audio-key1-3.m4s",
+                    "bipbop_480_624kbps-cenc-audio-key1-4.m4s",
+                  ],
       },
       {
-        name: "video",
-        type: 'video/mp4; codecs="avc1.64000d"',
-        fragments: [
-          "bipbop_480_624kbps-cenc-video-key1-init.mp4",
-          "bipbop_480_624kbps-cenc-video-key1-1.m4s",
-          "bipbop_300_215kbps-cenc-video-key1-init.mp4",
-          "bipbop_300_215kbps-cenc-video-key1-2.m4s",
-        ],
+        name:"video",
+        type:"video/mp4; codecs=\"avc1.64000d\"",
+        fragments:[ "bipbop_480_624kbps-cenc-video-key1-init.mp4",
+                    "bipbop_480_624kbps-cenc-video-key1-1.m4s",
+                    "bipbop_300_215kbps-cenc-video-key2-init.mp4",
+                    "bipbop_300_215kbps-cenc-video-key2-2.m4s",
+                  ],
       },
     ],
     keys: {
       // "keyid" : "key"
-      "7e571d037e571d037e571d037e571d11": "7e5733337e5733337e5733337e573311",
-      "7e571d047e571d047e571d047e571d21": "7e5744447e5744447e5744447e574421",
+      "7e571d037e571d037e571d037e571d11" : "7e5733337e5733337e5733337e573311",
+      "7e571d037e571d037e571d037e571d12" : "7e5733337e5733337e5733337e573312",
+      "7e571d047e571d047e571d047e571d21" : "7e5744447e5744447e5744447e574421",
     },
-    sessionType: "temporary",
-    sessionCount: 3,
-    duration: 1.6,
+    sessionType:"temporary",
+    sessionCount:3,
+    duration:1.60,
   },
   {
-    name: "640x480 then 400x300, same key (2nd) per track",
+    name:"400x300 with 1st keys then 640x480 with 2nd keys",
     tracks: [
       {
-        name: "audio",
-        type: 'audio/mp4; codecs="mp4a.40.2"',
-        fragments: [
-          "bipbop_480_624kbps-cenc-audio-key2-init.mp4",
-          "bipbop_480_624kbps-cenc-audio-key2-1.m4s",
-          "bipbop_480_624kbps-cenc-audio-key2-2.m4s",
-          "bipbop_480_624kbps-cenc-audio-key2-3.m4s",
-          "bipbop_480_624kbps-cenc-audio-key2-4.m4s",
-        ],
+        name:"audio",
+        type:"audio/mp4; codecs=\"mp4a.40.2\"",
+        fragments:[ "bipbop_300_215kbps-cenc-audio-key1-init.mp4",
+                    "bipbop_300_215kbps-cenc-audio-key1-1.m4s",
+                    "bipbop_300_215kbps-cenc-audio-key1-2.m4s",
+                    "bipbop_300_215kbps-cenc-audio-key1-3.m4s",
+                    "bipbop_300_215kbps-cenc-audio-key1-4.m4s",
+                  ],
       },
       {
-        name: "video",
-        type: 'video/mp4; codecs="avc1.64000d"',
-        fragments: [
-          "bipbop_480_624kbps-cenc-video-key2-init.mp4",
-          "bipbop_480_624kbps-cenc-video-key2-1.m4s",
-          "bipbop_300_215kbps-cenc-video-key2-init.mp4",
-          "bipbop_300_215kbps-cenc-video-key2-2.m4s",
-        ],
+        name:"video",
+        type:"video/mp4; codecs=\"avc1.64000d\"",
+        fragments:[ "bipbop_300_215kbps-cenc-video-key1-init.mp4",
+                    "bipbop_300_215kbps-cenc-video-key1-1.m4s",
+                    "bipbop_480_624kbps-cenc-video-key2-init.mp4",
+                    "bipbop_480_624kbps-cenc-video-key2-2.m4s",
+                  ],
       },
     ],
     keys: {
       // "keyid" : "key"
-      "7e571d037e571d037e571d037e571d12": "7e5733337e5733337e5733337e573312",
-      "7e571d047e571d047e571d047e571d22": "7e5744447e5744447e5744447e574422",
+      "7e571d037e571d037e571d037e571d11" : "7e5733337e5733337e5733337e573311",
+      "7e571d037e571d037e571d037e571d12" : "7e5733337e5733337e5733337e573312",
+      "7e571d047e571d047e571d047e571d21" : "7e5744447e5744447e5744447e574421",
     },
-    sessionType: "temporary",
-    sessionCount: 3,
-    duration: 1.6,
+    sessionType:"temporary",
+    sessionCount:3,
+    duration:1.60,
   },
   {
-    name: "640x480 with 1st keys then 400x300 with 2nd keys",
+    name:"640x480@959kbps with 1st keys then 640x480@624kbps with 2nd keys",
     tracks: [
       {
-        name: "audio",
-        type: 'audio/mp4; codecs="mp4a.40.2"',
-        fragments: [
-          "bipbop_480_624kbps-cenc-audio-key1-init.mp4",
-          "bipbop_480_624kbps-cenc-audio-key1-1.m4s",
-          "bipbop_480_624kbps-cenc-audio-key1-2.m4s",
-          "bipbop_480_624kbps-cenc-audio-key1-3.m4s",
-          "bipbop_480_624kbps-cenc-audio-key1-4.m4s",
-        ],
+        name:"audio",
+        type:"audio/mp4; codecs=\"mp4a.40.2\"",
+        fragments:[ "bipbop_480_959kbps-cenc-audio-key1-init.mp4",
+                    "bipbop_480_959kbps-cenc-audio-key1-1.m4s",
+                    "bipbop_480_959kbps-cenc-audio-key1-2.m4s",
+                    "bipbop_480_959kbps-cenc-audio-key1-3.m4s",
+                    "bipbop_480_959kbps-cenc-audio-key1-4.m4s",
+                  ],
       },
       {
-        name: "video",
-        type: 'video/mp4; codecs="avc1.64000d"',
-        fragments: [
-          "bipbop_480_624kbps-cenc-video-key1-init.mp4",
-          "bipbop_480_624kbps-cenc-video-key1-1.m4s",
-          "bipbop_300_215kbps-cenc-video-key2-init.mp4",
-          "bipbop_300_215kbps-cenc-video-key2-2.m4s",
-        ],
+        name:"video",
+        type:"video/mp4; codecs=\"avc1.64000d\"",
+        fragments:[ "bipbop_480_959kbps-cenc-video-key1-init.mp4",
+                    "bipbop_480_959kbps-cenc-video-key1-1.m4s",
+                    "bipbop_480_624kbps-cenc-video-key2-init.mp4",
+                    "bipbop_480_624kbps-cenc-video-key2-2.m4s",
+                  ],
       },
     ],
     keys: {
       // "keyid" : "key"
-      "7e571d037e571d037e571d037e571d11": "7e5733337e5733337e5733337e573311",
-      "7e571d037e571d037e571d037e571d12": "7e5733337e5733337e5733337e573312",
-      "7e571d047e571d047e571d047e571d21": "7e5744447e5744447e5744447e574421",
+      "7e571d037e571d037e571d037e571d11" : "7e5733337e5733337e5733337e573311",
+      "7e571d037e571d037e571d037e571d12" : "7e5733337e5733337e5733337e573312",
+      "7e571d047e571d047e571d047e571d21" : "7e5744447e5744447e5744447e574421",
     },
-    sessionType: "temporary",
-    sessionCount: 3,
-    duration: 1.6,
+    sessionType:"temporary",
+    sessionCount:3,
+    duration:1.60,
   },
   {
-    name: "400x300 with 1st keys then 640x480 with 2nd keys",
+    name:"640x480@624kbps with 1st keys then 640x480@959kbps with 2nd keys",
     tracks: [
       {
-        name: "audio",
-        type: 'audio/mp4; codecs="mp4a.40.2"',
-        fragments: [
-          "bipbop_300_215kbps-cenc-audio-key1-init.mp4",
-          "bipbop_300_215kbps-cenc-audio-key1-1.m4s",
-          "bipbop_300_215kbps-cenc-audio-key1-2.m4s",
-          "bipbop_300_215kbps-cenc-audio-key1-3.m4s",
-          "bipbop_300_215kbps-cenc-audio-key1-4.m4s",
-        ],
+        name:"audio",
+        type:"audio/mp4; codecs=\"mp4a.40.2\"",
+        fragments:[ "bipbop_480_624kbps-cenc-audio-key1-init.mp4",
+                    "bipbop_480_624kbps-cenc-audio-key1-1.m4s",
+                    "bipbop_480_624kbps-cenc-audio-key1-2.m4s",
+                    "bipbop_480_624kbps-cenc-audio-key1-3.m4s",
+                    "bipbop_480_624kbps-cenc-audio-key1-4.m4s",
+                  ],
       },
       {
-        name: "video",
-        type: 'video/mp4; codecs="avc1.64000d"',
-        fragments: [
-          "bipbop_300_215kbps-cenc-video-key1-init.mp4",
-          "bipbop_300_215kbps-cenc-video-key1-1.m4s",
-          "bipbop_480_624kbps-cenc-video-key2-init.mp4",
-          "bipbop_480_624kbps-cenc-video-key2-2.m4s",
-        ],
+        name:"video",
+        type:"video/mp4; codecs=\"avc1.64000d\"",
+        fragments:[ "bipbop_480_624kbps-cenc-video-key1-init.mp4",
+                    "bipbop_480_624kbps-cenc-video-key1-1.m4s",
+                    "bipbop_480_959kbps-cenc-video-key2-init.mp4",
+                    "bipbop_480_959kbps-cenc-video-key2-2.m4s",
+                  ],
       },
     ],
     keys: {
       // "keyid" : "key"
-      "7e571d037e571d037e571d037e571d11": "7e5733337e5733337e5733337e573311",
-      "7e571d037e571d037e571d037e571d12": "7e5733337e5733337e5733337e573312",
-      "7e571d047e571d047e571d047e571d21": "7e5744447e5744447e5744447e574421",
+      "7e571d037e571d037e571d037e571d11" : "7e5733337e5733337e5733337e573311",
+      "7e571d037e571d037e571d037e571d12" : "7e5733337e5733337e5733337e573312",
+      "7e571d047e571d047e571d047e571d21" : "7e5744447e5744447e5744447e574421",
     },
-    sessionType: "temporary",
-    sessionCount: 3,
-    duration: 1.6,
+    sessionType:"temporary",
+    sessionCount:3,
+    duration:1.60,
   },
   {
-    name: "640x480@959kbps with 1st keys then 640x480@624kbps with 2nd keys",
+    name:"400x300 with presentation size 533x300",
     tracks: [
       {
-        name: "audio",
-        type: 'audio/mp4; codecs="mp4a.40.2"',
-        fragments: [
-          "bipbop_480_959kbps-cenc-audio-key1-init.mp4",
-          "bipbop_480_959kbps-cenc-audio-key1-1.m4s",
-          "bipbop_480_959kbps-cenc-audio-key1-2.m4s",
-          "bipbop_480_959kbps-cenc-audio-key1-3.m4s",
-          "bipbop_480_959kbps-cenc-audio-key1-4.m4s",
-        ],
+        name:"audio",
+        type:"audio/mp4; codecs=\"mp4a.40.2\"",
+        fragments:[ "bipbop_300wp_227kbps-cenc-audio-key1-init.mp4",
+                    "bipbop_300wp_227kbps-cenc-audio-key1-1.m4s",
+                    "bipbop_300wp_227kbps-cenc-audio-key1-2.m4s",
+                    "bipbop_300wp_227kbps-cenc-audio-key1-3.m4s",
+                    "bipbop_300wp_227kbps-cenc-audio-key1-4.m4s",
+                  ],
       },
       {
-        name: "video",
-        type: 'video/mp4; codecs="avc1.64000d"',
-        fragments: [
-          "bipbop_480_959kbps-cenc-video-key1-init.mp4",
-          "bipbop_480_959kbps-cenc-video-key1-1.m4s",
-          "bipbop_480_624kbps-cenc-video-key2-init.mp4",
-          "bipbop_480_624kbps-cenc-video-key2-2.m4s",
-        ],
+        name:"video",
+        type:"video/mp4; codecs=\"avc1.64000d\"",
+        fragments:[ "bipbop_300wp_227kbps-cenc-video-key1-init.mp4",
+                    "bipbop_300wp_227kbps-cenc-video-key1-1.m4s",
+                    "bipbop_300wp_227kbps-cenc-video-key1-2.m4s",
+                  ],
       },
     ],
     keys: {
       // "keyid" : "key"
-      "7e571d037e571d037e571d037e571d11": "7e5733337e5733337e5733337e573311",
-      "7e571d037e571d037e571d037e571d12": "7e5733337e5733337e5733337e573312",
-      "7e571d047e571d047e571d047e571d21": "7e5744447e5744447e5744447e574421",
+      "7e571d037e571d037e571d037e571d11" : "7e5733337e5733337e5733337e573311",
+      "7e571d047e571d047e571d047e571d21" : "7e5744447e5744447e5744447e574421",
     },
-    sessionType: "temporary",
-    sessionCount: 3,
-    duration: 1.6,
+    sessionType:"temporary",
+    sessionCount:2,
+    duration:1.60,
   },
   {
-    name: "640x480@624kbps with 1st keys then 640x480@959kbps with 2nd keys",
+    name:"400x300 as-is then 400x300 presented as 533x300",
     tracks: [
       {
-        name: "audio",
-        type: 'audio/mp4; codecs="mp4a.40.2"',
-        fragments: [
-          "bipbop_480_624kbps-cenc-audio-key1-init.mp4",
-          "bipbop_480_624kbps-cenc-audio-key1-1.m4s",
-          "bipbop_480_624kbps-cenc-audio-key1-2.m4s",
-          "bipbop_480_624kbps-cenc-audio-key1-3.m4s",
-          "bipbop_480_624kbps-cenc-audio-key1-4.m4s",
-        ],
+        name:"audio",
+        type:"audio/mp4; codecs=\"mp4a.40.2\"",
+        fragments:[
+                    "bipbop_300_215kbps-cenc-audio-key1-init.mp4",
+                    "bipbop_300_215kbps-cenc-audio-key1-1.m4s",
+                    "bipbop_300_215kbps-cenc-audio-key1-2.m4s",
+                    "bipbop_300_215kbps-cenc-audio-key1-3.m4s",
+                    "bipbop_300_215kbps-cenc-audio-key1-4.m4s",
+                  ],
       },
       {
-        name: "video",
-        type: 'video/mp4; codecs="avc1.64000d"',
-        fragments: [
-          "bipbop_480_624kbps-cenc-video-key1-init.mp4",
-          "bipbop_480_624kbps-cenc-video-key1-1.m4s",
-          "bipbop_480_959kbps-cenc-video-key2-init.mp4",
-          "bipbop_480_959kbps-cenc-video-key2-2.m4s",
-        ],
+        name:"video",
+        type:"video/mp4; codecs=\"avc1.64000d\"",
+        fragments:[ "bipbop_300_215kbps-cenc-video-key1-init.mp4",
+                    "bipbop_300_215kbps-cenc-video-key1-1.m4s",
+                    "bipbop_300wp_227kbps-cenc-video-key1-init.mp4",
+                    "bipbop_300wp_227kbps-cenc-video-key1-2.m4s",
+                  ],
       },
     ],
     keys: {
       // "keyid" : "key"
-      "7e571d037e571d037e571d037e571d11": "7e5733337e5733337e5733337e573311",
-      "7e571d037e571d037e571d037e571d12": "7e5733337e5733337e5733337e573312",
-      "7e571d047e571d047e571d047e571d21": "7e5744447e5744447e5744447e574421",
+      "7e571d037e571d037e571d037e571d11" : "7e5733337e5733337e5733337e573311",
+      "7e571d047e571d047e571d047e571d21" : "7e5744447e5744447e5744447e574421",
     },
-    sessionType: "temporary",
-    sessionCount: 3,
-    duration: 1.6,
+    sessionType:"temporary",
+    sessionCount:3,
+    duration:1.60,
   },
   {
-    name: "400x300 with presentation size 533x300",
+    name:"400x225",
     tracks: [
       {
-        name: "audio",
-        type: 'audio/mp4; codecs="mp4a.40.2"',
-        fragments: [
-          "bipbop_300wp_227kbps-cenc-audio-key1-init.mp4",
-          "bipbop_300wp_227kbps-cenc-audio-key1-1.m4s",
-          "bipbop_300wp_227kbps-cenc-audio-key1-2.m4s",
-          "bipbop_300wp_227kbps-cenc-audio-key1-3.m4s",
-          "bipbop_300wp_227kbps-cenc-audio-key1-4.m4s",
-        ],
+        name:"audio",
+        type:"audio/mp4; codecs=\"mp4a.40.2\"",
+        fragments:[ "bipbop_225w_175kbps-cenc-audio-key1-init.mp4",
+                    "bipbop_225w_175kbps-cenc-audio-key1-1.m4s",
+                    "bipbop_225w_175kbps-cenc-audio-key1-2.m4s",
+                    "bipbop_225w_175kbps-cenc-audio-key1-3.m4s",
+                    "bipbop_225w_175kbps-cenc-audio-key1-4.m4s",
+                  ],
       },
       {
-        name: "video",
-        type: 'video/mp4; codecs="avc1.64000d"',
-        fragments: [
-          "bipbop_300wp_227kbps-cenc-video-key1-init.mp4",
-          "bipbop_300wp_227kbps-cenc-video-key1-1.m4s",
-          "bipbop_300wp_227kbps-cenc-video-key1-2.m4s",
-        ],
+        name:"video",
+        type:"video/mp4; codecs=\"avc1.64000d\"",
+        fragments:[ "bipbop_225w_175kbps-cenc-video-key1-init.mp4",
+                    "bipbop_225w_175kbps-cenc-video-key1-1.m4s",
+                  ],
       },
     ],
     keys: {
       // "keyid" : "key"
-      "7e571d037e571d037e571d037e571d11": "7e5733337e5733337e5733337e573311",
-      "7e571d047e571d047e571d047e571d21": "7e5744447e5744447e5744447e574421",
+      "7e571d037e571d037e571d037e571d11" : "7e5733337e5733337e5733337e573311",
+      "7e571d047e571d047e571d047e571d21" : "7e5744447e5744447e5744447e574421",
     },
-    sessionType: "temporary",
-    sessionCount: 2,
-    duration: 1.6,
+    sessionType:"temporary",
+    sessionCount:2,
+    duration:1.60,
   },
   {
-    name: "400x300 as-is then 400x300 presented as 533x300",
+    name:"640x360",
     tracks: [
       {
-        name: "audio",
-        type: 'audio/mp4; codecs="mp4a.40.2"',
-        fragments: [
-          "bipbop_300_215kbps-cenc-audio-key1-init.mp4",
-          "bipbop_300_215kbps-cenc-audio-key1-1.m4s",
-          "bipbop_300_215kbps-cenc-audio-key1-2.m4s",
-          "bipbop_300_215kbps-cenc-audio-key1-3.m4s",
-          "bipbop_300_215kbps-cenc-audio-key1-4.m4s",
-        ],
+        name:"audio",
+        type:"audio/mp4; codecs=\"mp4a.40.2\"",
+        fragments:[ "bipbop_360w_253kbps-cenc-audio-key1-init.mp4",
+                    "bipbop_360w_253kbps-cenc-audio-key1-1.m4s",
+                    "bipbop_360w_253kbps-cenc-audio-key1-2.m4s",
+                    "bipbop_360w_253kbps-cenc-audio-key1-3.m4s",
+                    "bipbop_360w_253kbps-cenc-audio-key1-4.m4s",
+                  ],
       },
       {
-        name: "video",
-        type: 'video/mp4; codecs="avc1.64000d"',
-        fragments: [
-          "bipbop_300_215kbps-cenc-video-key1-init.mp4",
-          "bipbop_300_215kbps-cenc-video-key1-1.m4s",
-          "bipbop_300wp_227kbps-cenc-video-key1-init.mp4",
-          "bipbop_300wp_227kbps-cenc-video-key1-2.m4s",
-        ],
+        name:"video",
+        type:"video/mp4; codecs=\"avc1.64000d\"",
+        fragments:[ "bipbop_360w_253kbps-cenc-video-key1-init.mp4",
+                    "bipbop_360w_253kbps-cenc-video-key1-1.m4s",
+                  ],
       },
     ],
     keys: {
       // "keyid" : "key"
-      "7e571d037e571d037e571d037e571d11": "7e5733337e5733337e5733337e573311",
-      "7e571d047e571d047e571d047e571d21": "7e5744447e5744447e5744447e574421",
+      "7e571d037e571d037e571d037e571d11" : "7e5733337e5733337e5733337e573311",
+      "7e571d047e571d047e571d047e571d21" : "7e5744447e5744447e5744447e574421",
     },
-    sessionType: "temporary",
-    sessionCount: 3,
-    duration: 1.6,
+    sessionType:"temporary",
+    sessionCount:2,
+    duration:1.60,
   },
   {
-    name: "400x225",
+    name:"400x225 then 640x360",
     tracks: [
       {
-        name: "audio",
-        type: 'audio/mp4; codecs="mp4a.40.2"',
-        fragments: [
-          "bipbop_225w_175kbps-cenc-audio-key1-init.mp4",
-          "bipbop_225w_175kbps-cenc-audio-key1-1.m4s",
-          "bipbop_225w_175kbps-cenc-audio-key1-2.m4s",
-          "bipbop_225w_175kbps-cenc-audio-key1-3.m4s",
-          "bipbop_225w_175kbps-cenc-audio-key1-4.m4s",
-        ],
+        name:"audio",
+        type:"audio/mp4; codecs=\"mp4a.40.2\"",
+        fragments:[ "bipbop_225w_175kbps-cenc-audio-key1-init.mp4",
+                    "bipbop_225w_175kbps-cenc-audio-key1-1.m4s",
+                    "bipbop_225w_175kbps-cenc-audio-key1-2.m4s",
+                    "bipbop_225w_175kbps-cenc-audio-key1-3.m4s",
+                    "bipbop_225w_175kbps-cenc-audio-key1-4.m4s",
+                  ],
       },
       {
-        name: "video",
-        type: 'video/mp4; codecs="avc1.64000d"',
-        fragments: [
-          "bipbop_225w_175kbps-cenc-video-key1-init.mp4",
-          "bipbop_225w_175kbps-cenc-video-key1-1.m4s",
-        ],
+        name:"video",
+        type:"video/mp4; codecs=\"avc1.64000d\"",
+        fragments:[ "bipbop_225w_175kbps-cenc-video-key1-init.mp4",
+                    "bipbop_225w_175kbps-cenc-video-key1-1.m4s",
+                    "bipbop_360w_253kbps-cenc-video-key2-init.mp4",
+                    "bipbop_360w_253kbps-cenc-video-key2-1.m4s",
+                  ],
       },
     ],
     keys: {
       // "keyid" : "key"
-      "7e571d037e571d037e571d037e571d11": "7e5733337e5733337e5733337e573311",
-      "7e571d047e571d047e571d047e571d21": "7e5744447e5744447e5744447e574421",
+      "7e571d037e571d037e571d037e571d11" : "7e5733337e5733337e5733337e573311",
+      "7e571d047e571d047e571d047e571d21" : "7e5744447e5744447e5744447e574421",
+      "7e571d037e571d037e571d037e571d12" : "7e5733337e5733337e5733337e573312",
     },
-    sessionType: "temporary",
-    sessionCount: 2,
-    duration: 1.6,
+    sessionType:"temporary",
+    sessionCount:3,
+    duration:1.60,
   },
   {
-    name: "640x360",
+    name:"640x360 then 640x480",
     tracks: [
       {
-        name: "audio",
-        type: 'audio/mp4; codecs="mp4a.40.2"',
-        fragments: [
-          "bipbop_360w_253kbps-cenc-audio-key1-init.mp4",
-          "bipbop_360w_253kbps-cenc-audio-key1-1.m4s",
-          "bipbop_360w_253kbps-cenc-audio-key1-2.m4s",
-          "bipbop_360w_253kbps-cenc-audio-key1-3.m4s",
-          "bipbop_360w_253kbps-cenc-audio-key1-4.m4s",
-        ],
+        name:"audio",
+        type:"audio/mp4; codecs=\"mp4a.40.2\"",
+        fragments:[ "bipbop_360w_253kbps-cenc-audio-key1-init.mp4",
+                    "bipbop_360w_253kbps-cenc-audio-key1-1.m4s",
+                    "bipbop_360w_253kbps-cenc-audio-key1-2.m4s",
+                    "bipbop_360w_253kbps-cenc-audio-key1-3.m4s",
+                    "bipbop_360w_253kbps-cenc-audio-key1-4.m4s",
+                  ],
       },
       {
-        name: "video",
-        type: 'video/mp4; codecs="avc1.64000d"',
-        fragments: [
-          "bipbop_360w_253kbps-cenc-video-key1-init.mp4",
-          "bipbop_360w_253kbps-cenc-video-key1-1.m4s",
-        ],
+        name:"video",
+        type:"video/mp4; codecs=\"avc1.64000d\"",
+        fragments:[ "bipbop_360w_253kbps-cenc-video-key1-init.mp4",
+                    "bipbop_360w_253kbps-cenc-video-key1-1.m4s",
+                    "bipbop_480_624kbps-cenc-video-key2-init.mp4",
+                    "bipbop_480_624kbps-cenc-video-key2-2.m4s",
+                  ],
       },
     ],
     keys: {
       // "keyid" : "key"
-      "7e571d037e571d037e571d037e571d11": "7e5733337e5733337e5733337e573311",
-      "7e571d047e571d047e571d047e571d21": "7e5744447e5744447e5744447e574421",
+      "7e571d037e571d037e571d037e571d11" : "7e5733337e5733337e5733337e573311",
+      "7e571d047e571d047e571d047e571d21" : "7e5744447e5744447e5744447e574421",
+      "7e571d037e571d037e571d037e571d12" : "7e5733337e5733337e5733337e573312",
     },
-    sessionType: "temporary",
-    sessionCount: 2,
-    duration: 1.6,
-  },
-  {
-    name: "400x225 then 640x360",
-    tracks: [
-      {
-        name: "audio",
-        type: 'audio/mp4; codecs="mp4a.40.2"',
-        fragments: [
-          "bipbop_225w_175kbps-cenc-audio-key1-init.mp4",
-          "bipbop_225w_175kbps-cenc-audio-key1-1.m4s",
-          "bipbop_225w_175kbps-cenc-audio-key1-2.m4s",
-          "bipbop_225w_175kbps-cenc-audio-key1-3.m4s",
-          "bipbop_225w_175kbps-cenc-audio-key1-4.m4s",
-        ],
-      },
-      {
-        name: "video",
-        type: 'video/mp4; codecs="avc1.64000d"',
-        fragments: [
-          "bipbop_225w_175kbps-cenc-video-key1-init.mp4",
-          "bipbop_225w_175kbps-cenc-video-key1-1.m4s",
-          "bipbop_360w_253kbps-cenc-video-key2-init.mp4",
-          "bipbop_360w_253kbps-cenc-video-key2-1.m4s",
-        ],
-      },
-    ],
-    keys: {
-      // "keyid" : "key"
-      "7e571d037e571d037e571d037e571d11": "7e5733337e5733337e5733337e573311",
-      "7e571d047e571d047e571d047e571d21": "7e5744447e5744447e5744447e574421",
-      "7e571d037e571d037e571d037e571d12": "7e5733337e5733337e5733337e573312",
-    },
-    sessionType: "temporary",
-    sessionCount: 3,
-    duration: 1.6,
-  },
-  {
-    name: "640x360 then 640x480",
-    tracks: [
-      {
-        name: "audio",
-        type: 'audio/mp4; codecs="mp4a.40.2"',
-        fragments: [
-          "bipbop_360w_253kbps-cenc-audio-key1-init.mp4",
-          "bipbop_360w_253kbps-cenc-audio-key1-1.m4s",
-          "bipbop_360w_253kbps-cenc-audio-key1-2.m4s",
-          "bipbop_360w_253kbps-cenc-audio-key1-3.m4s",
-          "bipbop_360w_253kbps-cenc-audio-key1-4.m4s",
-        ],
-      },
-      {
-        name: "video",
-        type: 'video/mp4; codecs="avc1.64000d"',
-        fragments: [
-          "bipbop_360w_253kbps-cenc-video-key1-init.mp4",
-          "bipbop_360w_253kbps-cenc-video-key1-1.m4s",
-          "bipbop_480_624kbps-cenc-video-key2-init.mp4",
-          "bipbop_480_624kbps-cenc-video-key2-2.m4s",
-        ],
-      },
-    ],
-    keys: {
-      // "keyid" : "key"
-      "7e571d037e571d037e571d037e571d11": "7e5733337e5733337e5733337e573311",
-      "7e571d047e571d047e571d047e571d21": "7e5744447e5744447e5744447e574421",
-      "7e571d037e571d037e571d037e571d12": "7e5733337e5733337e5733337e573312",
-    },
-    sessionType: "temporary",
-    sessionCount: 3,
-    duration: 1.6,
+    sessionType:"temporary",
+    sessionCount:3,
+    duration:1.60,
   },
   {
     // File generated with shaka packager:
@@ -1742,18 +1436,19 @@ var gEMETests = [
     name: "flac in mp4 clearkey",
     tracks: [
       {
-        name: "audio",
-        type: 'audio/mp4; codecs="flac"',
-        fragments: ["flac-sample-cenc.mp4"],
+        name:"audio",
+        type:"audio/mp4; codecs=\"flac\"",
+        fragments:[ "flac-sample-cenc.mp4",
+                  ],
       },
     ],
     keys: {
       // "keyid" : "key"
-      "7e571d047e571d047e571d047e571d21": "7e5744447e5744447e5744447e574421",
+      "7e571d047e571d047e571d047e571d21" : "7e5744447e5744447e5744447e574421",
     },
-    sessionType: "temporary",
-    sessionCount: 1,
-    duration: 2.05,
+    sessionType:"temporary",
+    sessionCount:1,
+    duration:2.05,
   },
   {
     // File generated with shaka packager:
@@ -1761,109 +1456,112 @@ var gEMETests = [
     name: "opus in mp4 clearkey",
     tracks: [
       {
-        name: "audio",
-        type: 'audio/mp4; codecs="opus"',
-        fragments: ["opus-sample-cenc.mp4"],
+        name:"audio",
+        type:"audio/mp4; codecs=\"opus\"",
+        fragments:[ "opus-sample-cenc.mp4",
+                  ],
       },
     ],
     keys: {
       // "keyid" : "key"
-      "7e571d047e571d047e571d047e571d21": "7e5744447e5744447e5744447e574421",
+      "7e571d047e571d047e571d047e571d21" : "7e5744447e5744447e5744447e574421",
     },
-    sessionType: "temporary",
-    sessionCount: 1,
-    duration: 1.98,
+    sessionType:"temporary",
+    sessionCount:1,
+    duration:1.98,
   },
   {
     name: "WebM vorbis audio & vp8 video clearkey",
     tracks: [
       {
-        name: "audio",
-        type: 'audio/webm; codecs="vorbis"',
-        fragments: ["bipbop_360w_253kbps-clearkey-audio.webm"],
+        name:"audio",
+        type:"audio/webm; codecs=\"vorbis\"",
+        fragments:[ "bipbop_360w_253kbps-clearkey-audio.webm",
+                  ],
       },
       {
-        name: "video",
-        type: 'video/webm; codecs="vp8"',
-        fragments: ["bipbop_360w_253kbps-clearkey-video-vp8.webm"],
+        name:"video",
+        type:"video/webm; codecs=\"vp8\"",
+        fragments:[ "bipbop_360w_253kbps-clearkey-video-vp8.webm",
+                  ],
       },
     ],
     keys: {
       // "keyid" : "key"
-      f1f3ee1790527e9de47217d43835f76a: "97b9ddc459c8d5ff23c1f2754c95abe8",
-      "8b5df745ad84145b5617c33116e35a67": "bddfd35dd9be033ee73bc18bc1885056",
+      "f1f3ee1790527e9de47217d43835f76a" : "97b9ddc459c8d5ff23c1f2754c95abe8",
+      "8b5df745ad84145b5617c33116e35a67" : "bddfd35dd9be033ee73bc18bc1885056",
     },
-    sessionType: "temporary",
-    sessionCount: 2,
-    duration: 1.6,
+    sessionType:"temporary",
+    sessionCount:2,
+    duration:1.60,
   },
   {
     name: "WebM vorbis audio & vp9 video clearkey",
     tracks: [
       {
-        name: "audio",
-        type: 'audio/webm; codecs="vorbis"',
-        fragments: ["bipbop_360w_253kbps-clearkey-audio.webm"],
+        name:"audio",
+        type:"audio/webm; codecs=\"vorbis\"",
+        fragments:[ "bipbop_360w_253kbps-clearkey-audio.webm",
+                  ],
       },
       {
-        name: "video",
-        type: 'video/webm; codecs="vp9"',
-        fragments: ["bipbop_360w_253kbps-clearkey-video-vp9.webm"],
+        name:"video",
+        type:"video/webm; codecs=\"vp9\"",
+        fragments:[ "bipbop_360w_253kbps-clearkey-video-vp9.webm",
+                  ],
       },
     ],
     keys: {
       // "keyid" : "key"
-      f1f3ee1790527e9de47217d43835f76a: "97b9ddc459c8d5ff23c1f2754c95abe8",
-      eedf63a94fa7c398ee094f123a4ee709: "973b679a746c82f3acdb856b30e9378e",
+      "f1f3ee1790527e9de47217d43835f76a" : "97b9ddc459c8d5ff23c1f2754c95abe8",
+      "eedf63a94fa7c398ee094f123a4ee709" : "973b679a746c82f3acdb856b30e9378e",
     },
-    sessionType: "temporary",
-    sessionCount: 2,
-    duration: 1.6,
+    sessionType:"temporary",
+    sessionCount:2,
+    duration:1.60,
   },
   {
     name: "WebM vorbis audio & vp9 video clearkey with subsample encryption",
     tracks: [
       {
-        name: "audio",
-        type: 'audio/webm; codecs="vorbis"',
-        fragments: ["sintel-short-clearkey-subsample-encrypted-audio.webm"],
+        name:"audio",
+        type:"audio/webm; codecs=\"vorbis\"",
+        fragments:[ "sintel-short-clearkey-subsample-encrypted-audio.webm",
+                  ],
       },
       {
-        name: "video",
-        type: 'video/webm; codecs="vp9"',
-        fragments: ["sintel-short-clearkey-subsample-encrypted-video.webm"],
+        name:"video",
+        type:"video/webm; codecs=\"vp9\"",
+        fragments:[ "sintel-short-clearkey-subsample-encrypted-video.webm",
+                  ],
       },
     ],
     keys: {
       // "keyid" : "key"
-      "2cdb0ed6119853e7850671c3e9906c3c": "808B9ADAC384DE1E4F56140F4AD76194",
+      "2cdb0ed6119853e7850671c3e9906c3c" : "808B9ADAC384DE1E4F56140F4AD76194",
     },
-    sessionType: "temporary",
-    sessionCount: 2,
-    duration: 2.0,
+    sessionType:"temporary",
+    sessionCount:2,
+    duration:2.0,
   },
 ];
 
 var gEMENonMSEFailTests = [
   {
-    name: "short-cenc.mp4",
-    audioType: 'audio/mp4; codecs="mp4a.40.2"',
-    videoType: 'video/mp4; codecs="avc1.64000d"',
-    duration: 0.47,
+    name:"short-cenc.mp4",
+    audioType:"audio/mp4; codecs=\"mp4a.40.2\"",
+    videoType:"video/mp4; codecs=\"avc1.64000d\"",
+    duration:0.47,
   },
 ];
 
 // These are files that are used for video decode suspend in
 // background tabs tests.
 var gDecodeSuspendTests = [
-  { name: "gizmo.mp4", type: "video/mp4", duration: 5.56 },
-  { name: "gizmo-noaudio.mp4", type: "video/mp4", duration: 5.56 },
-  { name: "gizmo.webm", type: 'video/webm; codecs="vp9,opus"', duration: 5.56 },
-  {
-    name: "gizmo-noaudio.webm",
-    type: 'video/webm; codecs="vp9"',
-    duration: 5.56,
-  },
+  { name:"gizmo.mp4", type:"video/mp4", duration:5.56 },
+  { name:"gizmo-noaudio.mp4", type:"video/mp4", duration:5.56 },
+  { name:"gizmo.webm", type:'video/webm; codecs="vp9,opus"', duration:5.56 },
+  { name:"gizmo-noaudio.webm", type:'video/webm; codecs="vp9"', duration:5.56 }
 ];
 
 function checkMetadata(msg, e, test) {
@@ -1874,43 +1572,32 @@ function checkMetadata(msg, e, test) {
     is(e.videoHeight, test.height, msg + " video height");
   }
   if (test.duration) {
-    ok(
-      Math.abs(e.duration - test.duration) < 0.1,
-      msg + " duration (" + e.duration + ") should be around " + test.duration
-    );
+    ok(Math.abs(e.duration - test.duration) < 0.1,
+       msg + " duration (" + e.duration + ") should be around " + test.duration);
   }
-  is(
-    !!test.keys,
-    SpecialPowers.do_lookupGetter(e, "isEncrypted").apply(e),
-    msg + " isEncrypted should be true if we have decryption keys"
-  );
+  is(!!test.keys, SpecialPowers.do_lookupGetter(e, "isEncrypted").apply(e),
+     msg + " isEncrypted should be true if we have decryption keys");
 }
 
 // Returns the first test from candidates array which we can play with the
 // installed video backends.
 function getPlayableVideo(candidates) {
   var resources = getPlayableVideos(candidates);
-  if (resources.length > 0) {
+  if (resources.length > 0)
     return resources[0];
-  }
   return null;
 }
 
 function getPlayableVideos(candidates) {
   var v = manifestVideo();
-  return candidates.filter(function(x) {
-    return /^video/.test(x.type) && v.canPlayType(x.type);
-  });
+  return candidates.filter(function(x){return /^video/.test(x.type) && v.canPlayType(x.type);});
 }
 
 function getPlayableAudio(candidates) {
   var v = manifestVideo();
-  var resources = candidates.filter(function(x) {
-    return /^audio/.test(x.type) && v.canPlayType(x.type);
-  });
-  if (resources.length > 0) {
+  var resources = candidates.filter(function(x){return /^audio/.test(x.type) && v.canPlayType(x.type);});
+  if (resources.length > 0)
     return resources[0];
-  }
   return null;
 }
 
@@ -1918,8 +1605,9 @@ function getPlayableAudio(candidates) {
 function getMajorMimeType(mimetype) {
   if (/^video/.test(mimetype)) {
     return "video";
+  } else {
+    return "audio";
   }
-  return "audio";
 }
 
 // Force releasing decoder to avoid timeout in waiting for decoding resource.
@@ -1936,13 +1624,9 @@ function removeNodeAndSource(n) {
 
 function once(target, name, cb) {
   var p = new Promise(function(resolve, reject) {
-    target.addEventListener(
-      name,
-      function() {
-        resolve();
-      },
-      { once: true }
-    );
+    target.addEventListener(name, function() {
+      resolve();
+    }, {once: true});
   });
   if (cb) {
     p.then(cb);
@@ -1956,34 +1640,29 @@ function once(target, name, cb) {
  * @returns {Promise} A promise that is resolved when event happens.
  */
 function nextEvent(video, eventName) {
-  return new Promise(function(resolve, reject) {
-    let f = function(event) {
-      video.removeEventListener(eventName, f);
+  return new Promise(function (resolve, reject) {
+    let f = function (event) {
+      video.removeEventListener(eventName, f, false);
       resolve(event);
     };
-    video.addEventListener(eventName, f);
+    video.addEventListener(eventName, f, false);
   });
 }
 
 function TimeStamp(token) {
   function pad(x) {
-    return x < 10 ? "0" + x : x;
+    return (x < 10) ? "0" + x : x;
   }
   var now = new Date();
   var ms = now.getMilliseconds();
-  var time =
-    "[" +
-    pad(now.getHours()) +
-    ":" +
-    pad(now.getMinutes()) +
-    ":" +
-    pad(now.getSeconds()) +
-    "." +
-    ms +
-    "]" +
-    // eslint-disable-next-line no-nested-ternary
-    (ms < 10 ? "  " : ms < 100 ? " " : "");
-  return token ? time + " " + token : time;
+  var time = "[" +
+             pad(now.getHours()) + ":" +
+             pad(now.getMinutes()) + ":" +
+             pad(now.getSeconds()) + "." +
+             ms +
+             "]" +
+             (ms < 10 ? "  " : (ms < 100 ? " " : ""));
+  return token ? (time + " " + token) : time;
 }
 
 function Log(token, msg) {
@@ -1996,9 +1675,9 @@ var PARALLEL_TESTS = 2;
 // Prefs to set before running tests.  Use this to improve coverage of
 // conditions that might not otherwise be encountered on the test data.
 var gTestPrefs = [
-  ["media.recorder.max_memory", 1024],
-  ["media.audio-max-decode-error", 0],
-  ["media.video-max-decode-error", 0],
+  ['media.recorder.max_memory', 1024],
+  ['media.audio-max-decode-error', 0],
+  ['media.video-max-decode-error', 0],
 ];
 
 // When true, we'll loop forever on whatever test we run. Use this to debug
@@ -2021,6 +1700,7 @@ const DEBUG_TEST_LOOP_FOREVER = false;
 //      the token back to the manager. The manager may either start the next run
 //      or end the mochitest if all the tests are done.
 function MediaTestManager() {
+
   // Set a very large timeout to prevent Mochitest timeout.
   // Instead MediaTestManager will manage timeout of each test.
   SimpleTest.requestLongerTimeout(1000);
@@ -2040,13 +1720,7 @@ function MediaTestManager() {
   // else you'll timeout.
   this.runTests = function(tests, startTest) {
     this.startTime = new Date();
-    SimpleTest.info(
-      "Started " +
-        this.startTime +
-        " (" +
-        this.startTime.getTime() / 1000 +
-        "s)"
-    );
+    SimpleTest.info("Started " + this.startTime + " (" + this.startTime.getTime()/1000 + "s)");
     this.testNum = 0;
     this.tests = tests;
     this.startTest = startTest;
@@ -2058,7 +1732,7 @@ function MediaTestManager() {
 
     // Always wait for explicit finish.
     SimpleTest.waitForExplicitFinish();
-    SpecialPowers.pushPrefEnv({ set: gTestPrefs }, () => {
+    SpecialPowers.pushPrefEnv({'set': gTestPrefs}, () => {
       this.nextTest();
     });
 
@@ -2073,7 +1747,7 @@ function MediaTestManager() {
         }
       }
     });
-  };
+  }
 
   // Registers that the test corresponding to 'token' has been started.
   // Don't call more than once per token.
@@ -2090,22 +1764,11 @@ function MediaTestManager() {
     };
     // Default timeout to 180s for each test.
     // Call SimpleTest._originalSetTimeout() to bypass the flaky timeout checker.
-    this.timers[token] = SimpleTest._originalSetTimeout.call(
-      window,
-      onTimeout,
-      180000
-    );
+    this.timers[token] = SimpleTest._originalSetTimeout.call(window, onTimeout, 180000);
 
-    is(
-      this.numTestsRunning,
-      this.tokens.length,
-      "[started " +
-        token +
-        " t=" +
-        elapsedTime(this.startTime) +
-        "] Length of array should match number of running tests"
-    );
-  };
+    is(this.numTestsRunning, this.tokens.length,
+       "[started " + token + " t=" + elapsedTime(this.startTime) + "] Length of array should match number of running tests");
+  }
 
   // Registers that the test corresponding to 'token' has finished. Call when
   // you've finished your test. If all tests are complete this will finish the
@@ -2126,29 +1789,19 @@ function MediaTestManager() {
 
     info("[finished " + token + "] remaining= " + this.tokens);
     this.numTestsRunning--;
-    is(
-      this.numTestsRunning,
-      this.tokens.length,
-      "[finished " +
-        token +
-        " t=" +
-        elapsedTime(this.startTime) +
-        "] Length of array should match number of running tests"
-    );
+    is(this.numTestsRunning, this.tokens.length,
+       "[finished " + token + " t=" + elapsedTime(this.startTime) + "] Length of array should match number of running tests");
     if (this.tokens.length < PARALLEL_TESTS) {
       this.nextTest();
     }
-  };
+  }
 
   // Starts the next batch of tests, or finishes if they're all done.
   // Don't call this directly, call finished(token) when you're done.
   this.nextTest = function() {
-    while (
-      this.testNum < this.tests.length &&
-      this.tokens.length < PARALLEL_TESTS
-    ) {
+    while (this.testNum < this.tests.length && this.tokens.length < PARALLEL_TESTS) {
       var test = this.tests[this.testNum];
-      var token = (test.name ? test.name + "-" : "") + this.testNum;
+      var token = (test.name ? (test.name + "-"): "") + this.testNum;
       this.testNum++;
 
       if (DEBUG_TEST_LOOP_FOREVER && this.testNum == this.tests.length) {
@@ -2156,55 +1809,49 @@ function MediaTestManager() {
       }
 
       // Ensure we can play the resource type.
-      if (
-        test.type &&
-        !document.createElement("video").canPlayType(test.type)
-      ) {
+      if (test.type && !document.createElement('video').canPlayType(test.type))
         continue;
-      }
 
       // Do the init. This should start the test.
       this.startTest(test, token);
     }
 
-    if (
-      this.testNum == this.tests.length &&
-      !DEBUG_TEST_LOOP_FOREVER &&
-      this.tokens.length == 0 &&
-      !this.isShutdown
-    ) {
+    if (this.testNum == this.tests.length &&
+        !DEBUG_TEST_LOOP_FOREVER &&
+        this.tokens.length == 0 &&
+        !this.isShutdown)
+    {
       this.isShutdown = true;
       if (this.onFinished) {
         this.onFinished();
       }
       var onCleanup = () => {
         var end = new Date();
-        SimpleTest.info(
-          "Finished at " + end + " (" + end.getTime() / 1000 + "s)"
-        );
+        SimpleTest.info("Finished at " + end + " (" + (end.getTime() / 1000) + "s)");
         SimpleTest.info("Running time: " + elapsedTime(this.startTime) + "s");
         SimpleTest.finish();
       };
       mediaTestCleanup(onCleanup);
+      return;
     }
-  };
+  }
 }
 
 // Ensures we've got no active video or audio elements in the document, and
 // forces a GC to release the address space reserved by the decoders' threads'
 // stacks.
 function mediaTestCleanup(callback) {
-  var V = document.getElementsByTagName("video");
-  for (let i = 0; i < V.length; i++) {
-    removeNodeAndSource(V[i]);
-    V[i] = null;
-  }
-  var A = document.getElementsByTagName("audio");
-  for (let i = 0; i < A.length; i++) {
-    removeNodeAndSource(A[i]);
-    A[i] = null;
-  }
-  SpecialPowers.exactGC(callback);
+    var V = document.getElementsByTagName("video");
+    for (i=0; i<V.length; i++) {
+      removeNodeAndSource(V[i]);
+      V[i] = null;
+    }
+    var A = document.getElementsByTagName("audio");
+    for (i=0; i<A.length; i++) {
+      removeNodeAndSource(A[i]);
+      A[i] = null;
+    }
+    SpecialPowers.exactGC(callback);
 }
 
 async function dumpDebugInfoForToken(token) {
@@ -2230,14 +1877,10 @@ if ("SimpleTest" in window) {
   // Register timeout function to dump debugging logs.
   SimpleTest.registerTimeoutFunction(async function() {
     for (const v of document.getElementsByTagName("video")) {
-      SimpleTest.info(
-        JSON.stringify(await SpecialPowers.wrap(v).mozRequestDebugInfo())
-      );
+      SimpleTest.info(JSON.stringify(await SpecialPowers.wrap(v).mozRequestDebugInfo()));
     }
     for (const a of document.getElementsByTagName("audio")) {
-      SimpleTest.info(
-        JSON.stringify(await SpecialPowers.wrap(a).mozRequestDebugInfo())
-      );
+      SimpleTest.info(JSON.stringify(await SpecialPowers.wrap(a).mozRequestDebugInfo()));
     }
   });
 }
diff --git a/dom/media/test/marionette/yttest/debug_info.js b/dom/media/test/marionette/yttest/debug_info.js
index a7d3fe3d0a4b..2738d2b8ea55 100644
--- a/dom/media/test/marionette/yttest/debug_info.js
+++ b/dom/media/test/marionette/yttest/debug_info.js
@@ -1,20 +1,18 @@
-/* global video, result, resolve */
-
 video.mozRequestDebugInfo().then(debugInfo => {
   // The parsing won't be necessary once we have bug 1542674
   try {
-    debugInfo = debugInfo.replace(/\t/g, "").split(/\n/g);
+    debugInfo = debugInfo.replace(/\t/g, '').split(/\n/g);
     var JSONDebugInfo = "{";
-    for (let g = 0; g < debugInfo.length - 1; g++) {
-      var pair = debugInfo[g].split(": ");
-      JSONDebugInfo += '"' + pair[0] + '":"' + pair[1] + '",';
-    }
-    JSONDebugInfo = JSONDebugInfo.slice(0, JSONDebugInfo.length - 1);
-    JSONDebugInfo += "}";
-    result.mozRequestDebugInfo = JSON.parse(JSONDebugInfo);
+      for(let g =0; g<debugInfo.length-1; g++){
+          var pair = debugInfo[g].split(": ");
+          JSONDebugInfo += '"' + pair[0] + '":"' + pair[1] + '",';
+      }
+      JSONDebugInfo = JSONDebugInfo.slice(0,JSONDebugInfo.length-1);
+      JSONDebugInfo += "}";
+      result["mozRequestDebugInfo"] = JSON.parse(JSONDebugInfo);
   } catch (err) {
     console.log(`Error '${err.toString()} in JSON.parse(${debugInfo})`);
-    result.mozRequestDebugInfo = debugInfo;
+    result["mozRequestDebugInfo"] = debugInfo;
   }
   resolve(result);
 });
diff --git a/dom/media/test/marionette/yttest/force_hd.js b/dom/media/test/marionette/yttest/force_hd.js
index 03c9c1efdd8a..ab3d2b54db48 100644
--- a/dom/media/test/marionette/yttest/force_hd.js
+++ b/dom/media/test/marionette/yttest/force_hd.js
@@ -2,29 +2,23 @@
 // https://addons.mozilla.org/en-US/firefox/addon/youtube-auto-hd-lq/
 // licence: MPL 2.0
 var config = {
-  HD: true,
-  LQ: false,
-  ID: "auto-hd-lq-for-ytb",
-  type(t) {
-    config.HD = t === "hd";
-    config.LQ = t === "lq";
+  "HD": true,
+  "LQ": false,
+  "ID": "auto-hd-lq-for-ytb",
+  "type": function (t) {
+    config.HD = t === 'hd';
+    config.LQ = t === 'lq';
   },
-  quality() {
+  "quality": function () {
     if (config.HD || config.LQ) {
-      var youtubePlayerListener = function(LQ, HD) {
-        return function(e) {
+      var youtubePlayerListener = function (LQ, HD) {
+        return function youtubePlayerListener (e) {
           if (e === 1) {
-            var player = document.getElementById("movie_player");
+            var player = document.getElementById('movie_player');
             if (player) {
               var levels = player.getAvailableQualityLevels();
               if (levels.length) {
-                var q =
-                  // eslint-disable-next-line no-nested-ternary
-                  HD && levels[0]
-                    ? levels[0]
-                    : LQ && levels[levels.length - 2]
-                    ? levels[levels.length - 2]
-                    : null;
+                var q = (HD && levels[0]) ? levels[0] : ((LQ && levels[levels.length - 2]) ? levels[levels.length - 2] : null);
                 if (q) {
                   player.setPlaybackQuality(q);
                   player.setPlaybackQualityRange(q, q);
@@ -32,17 +26,15 @@ var config = {
               }
             }
           }
-        };
-      };
+        }
+      }
       /*  */
-      var inject = function() {
-        var action = function() {
-          var player = document.getElementById("movie_player");
+      var inject = function () {
+        var action = function () {
+          var player = document.getElementById('movie_player');
           if (player && player.addEventListener && player.getPlayerState) {
             player.addEventListener("onStateChange", "youtubePlayerListener");
-          } else {
-            window.setTimeout(action, 1000);
-          }
+          } else window.setTimeout(action, 1000);
         };
         /*  */
         action();
@@ -55,37 +47,27 @@ var config = {
         document.documentElement.appendChild(script);
       }
       /*  */
-      script.textContent =
-        "var youtubePlayerListener = (" +
-        youtubePlayerListener +
-        ")(" +
-        config.LQ +
-        "," +
-        config.HD +
-        ");(" +
-        inject +
-        ")();";
+      script.textContent = "var youtubePlayerListener = (" + youtubePlayerListener + ')(' + config.LQ + ',' + config.HD  + ');(' + inject + ')();';
     }
-  },
+  }
 };
 
-if (/^https?:\/\/www\.youtube.com\/watch\?/.test(document.location.href)) {
-  config.quality();
-}
-var content = document.getElementById("content");
-if (content) {
-  var observer = new window.MutationObserver(function(e) {
-    e.forEach(function(m) {
-      if (m.addedNodes !== null) {
-        for (var i = 0; i < m.addedNodes.length; i++) {
-          if (m.addedNodes[i].id === "movie_player") {
-            config.quality();
-            return;
+  if (/^https?:\/\/www\.youtube.com\/watch\?/.test(document.location.href)) config.quality();
+  var content = document.getElementById('content');
+  if (content) {
+    var observer = new window.MutationObserver(function (e) {
+      e.forEach(function (m) {
+        if (m.addedNodes !== null) {
+          for (var i = 0; i < m.addedNodes.length; i++) {
+            if (m.addedNodes[i].id === 'movie_player') {
+              config.quality();
+              return;
+            }
           }
         }
-      }
+      });
     });
-  });
-  /*  */
-  observer.observe(content, { childList: true, subtree: true });
-}
+    /*  */
+    observer.observe(content, {"childList": true, "subtree": true});
+  }
+
diff --git a/dom/media/test/marionette/yttest/video_playback_quality.js b/dom/media/test/marionette/yttest/video_playback_quality.js
index baa6376595d8..52be76003a15 100644
--- a/dom/media/test/marionette/yttest/video_playback_quality.js
+++ b/dom/media/test/marionette/yttest/video_playback_quality.js
@@ -1,2 +1 @@
-/* global video */
-var result = { getVideoPlaybackQuality: video.getVideoPlaybackQuality() };
+var result = {"getVideoPlaybackQuality": video.getVideoPlaybackQuality()};
diff --git a/dom/media/test/play_promise.js b/dom/media/test/play_promise.js
index 7051fedc19a1..08b2dd7a8fed 100644
--- a/dom/media/test/play_promise.js
+++ b/dom/media/test/play_promise.js
@@ -1,3 +1,3 @@
 function getNotSupportedFile(name) {
   return name + ".bad";
-}
+}
\ No newline at end of file
diff --git a/dom/media/test/seek_support.js b/dom/media/test/seek_support.js
index b100572a5aa2..6e9c28b42e39 100644
--- a/dom/media/test/seek_support.js
+++ b/dom/media/test/seek_support.js
@@ -1,20 +1,16 @@
-// This file expects manifest.js to be included in the same scope.
-/* import-globals-from manifest.js */
-// This file expects SEEK_TEST_NUMBER to be defined by the test.
-/* global SEEK_TEST_NUMBER */
-var manager = new MediaTestManager();
+var manager = new MediaTestManager;
 
 function createTestArray() {
   var tests = [];
   var tmpVid = document.createElement("video");
 
-  for (var testNum = 0; testNum < gSeekTests.length; testNum++) {
+  for (var testNum=0; testNum<gSeekTests.length; testNum++) {
     var test = gSeekTests[testNum];
     if (!tmpVid.canPlayType(test.type)) {
       continue;
     }
 
-    var t = {};
+    var t = new Object;
     t.name = test.name;
     t.type = test.type;
     t.duration = test.duration;
@@ -25,37 +21,25 @@ function createTestArray() {
 }
 
 function startTest(test, token) {
-  var video = document.createElement("video");
-  video.token = token += "-seek" + test.number + ".js";
-  manager.started(video.token);
-  video.src = test.name;
-  video.preload = "metadata";
-  document.body.appendChild(video);
+  var v = document.createElement('video');
+  v.token = token += "-seek" + test.number + ".js";
+  manager.started(v.token);
+  v.src = test.name;
+  v.preload = "metadata";
+  document.body.appendChild(v);
   var name = test.name + " seek test " + test.number;
-  var localIs = (function(n) {
-    return function(a, b, msg) {
-      is(a, b, n + ": " + msg);
-    };
-  })(name);
-  var localOk = (function(n) {
-    return function(a, msg) {
-      ok(a, n + ": " + msg);
-    };
-  })(name);
-  var localFinish = (function(v, m) {
-    return function() {
-      v.onerror = null;
-      removeNodeAndSource(v);
-      dump("SEEK-TEST: Finished " + name + " token: " + v.token + "\n");
-      m.finished(v.token);
-    };
-  })(video, manager);
+  var localIs = function(name) { return function(a, b, msg) {
+    is(a, b, name + ": " + msg);
+  }}(name);
+  var localOk = function(name) { return function(a, msg) {
+    ok(a, name + ": " + msg);
+  }}(name);
+  var localFinish = function(v, manager) { return function() {
+    v.onerror = null;
+    removeNodeAndSource(v);
+    dump("SEEK-TEST: Finished " + name + " token: " + v.token + "\n");
+    manager.finished(v.token);
+  }}(v, manager);
   dump("SEEK-TEST: Started " + name + "\n");
-  window["test_seek" + test.number](
-    video,
-    test.duration / 2,
-    localIs,
-    localOk,
-    localFinish
-  );
+  window['test_seek' + test.number](v, test.duration/2, localIs, localOk, localFinish);
 }
diff --git a/dom/media/test/test_access_control.html b/dom/media/test/test_access_control.html
index 816563f9f503..9c6dd6deef7c 100644
--- a/dom/media/test/test_access_control.html
+++ b/dom/media/test/test_access_control.html
@@ -41,10 +41,8 @@ function receiveMessage(event)
     return;
   }
 
-  if (event.data.done == "true") {
-    done();
-    return;
-  }
+  if (event.data.done == "true")
+    return done();
 
   ok(event.data.result, event.data.message);
 }
diff --git a/dom/media/test/test_autoplay_policy_activation.html b/dom/media/test/test_autoplay_policy_activation.html
index 225cb94390c4..66e300097892 100644
--- a/dom/media/test/test_autoplay_policy_activation.html
+++ b/dom/media/test/test_autoplay_policy_activation.html
@@ -136,7 +136,7 @@
         let child_url = "file_autoplay_policy_activation_window.html";
 
         async function runTest() {
-          for (const test_case of test_cases) {
+          for (test_case of test_cases) {
             // Run each test in a new window, to ensure its user gesture
             // activation state isn't tainted by preceeding tests.
             let child = window.open(child_url, "", "width=500,height=500");
diff --git a/dom/media/test/test_autoplay_policy_eventdown_activation.html b/dom/media/test/test_autoplay_policy_eventdown_activation.html
index 82b9777282af..b3e785096f78 100644
--- a/dom/media/test/test_autoplay_policy_eventdown_activation.html
+++ b/dom/media/test/test_autoplay_policy_eventdown_activation.html
@@ -31,7 +31,7 @@
             let child = window.open(child_url, "", "width=500,height=500");
             await once(child, "load");
             child.postMessage("run keydown test", window.origin);
-            await nextWindowMessage();
+            let result = await nextWindowMessage();
             child.close();
           }
 
@@ -39,7 +39,7 @@
             let child = window.open(child_url, "", "width=500,height=500");
             await once(child, "load");
             child.postMessage("run mousedown test", window.origin);
-            await nextWindowMessage();
+            let result = await nextWindowMessage();
             child.close();
           }
 
diff --git a/dom/media/test/test_autoplay_policy_key_blacklist.html b/dom/media/test/test_autoplay_policy_key_blacklist.html
index 967effbebf75..44e785afe7ae 100644
--- a/dom/media/test/test_autoplay_policy_key_blacklist.html
+++ b/dom/media/test/test_autoplay_policy_key_blacklist.html
@@ -33,7 +33,7 @@
           let child = window.open(child_url, "", "width=500,height=500");
           await once(child, "load");
           child.postMessage("run test", window.origin);
-          await nextWindowMessage();
+          let result = await nextWindowMessage();
           child.close();
           SimpleTest.finish();
         }
diff --git a/dom/media/test/test_autoplay_policy_play_before_loadedmetadata.html b/dom/media/test/test_autoplay_policy_play_before_loadedmetadata.html
index 7295d2734a61..65ae9b4abecd 100644
--- a/dom/media/test/test_autoplay_policy_play_before_loadedmetadata.html
+++ b/dom/media/test/test_autoplay_policy_play_before_loadedmetadata.html
@@ -52,13 +52,13 @@
         let child_url = "file_autoplay_policy_play_before_loadedmetadata.html";
 
         async function runTest() {
-          for (const testCase of testCases) {
+          for (testCase of testCases) {
             // Run each test in a new window, to ensure its user gesture
             // activation state isn't tainted by preceeding tests.
             let child = window.open(child_url, "", "width=500,height=500");
             await once(child, "load");
             child.postMessage(testCase, window.origin);
-            await nextWindowMessage();
+            let result = await nextWindowMessage();
             child.close();
           }
           SimpleTest.finish();
diff --git a/dom/media/test/test_autoplay_policy_unmute_pauses.html b/dom/media/test/test_autoplay_policy_unmute_pauses.html
index 1626cc7cfd69..47e39204483c 100644
--- a/dom/media/test/test_autoplay_policy_unmute_pauses.html
+++ b/dom/media/test/test_autoplay_policy_unmute_pauses.html
@@ -43,13 +43,13 @@
         let child_url = "file_autoplay_policy_unmute_pauses.html";
 
         async function runTest() {
-          for (const testCase of testCases) {
+          for (testCase of testCases) {
             // Run each test in a new window, to ensure its user gesture
             // activation state isn't tainted by preceeding tests.
             let child = window.open(child_url, "", "width=500,height=500");
             await once(child, "load");
             child.postMessage(testCase, window.origin);
-            await nextWindowMessage();
+            let result = await nextWindowMessage();
             child.close();
           }
           SimpleTest.finish();
diff --git a/dom/media/test/test_autoplay_policy_web_audio_AudioParamStream.html b/dom/media/test/test_autoplay_policy_web_audio_AudioParamStream.html
index 9ae68775b3f5..4f181332cb1a 100644
--- a/dom/media/test/test_autoplay_policy_web_audio_AudioParamStream.html
+++ b/dom/media/test/test_autoplay_policy_web_audio_AudioParamStream.html
@@ -51,7 +51,6 @@ function setupTestPreferences() {
 }
 
 function createAudioContext() {
-  /* global ac */
   window.ac = new AudioContext();
 
   ac.allowedToStart = new Promise(resolve => {
@@ -102,7 +101,7 @@ function createAudioParams(nodeType) {
       return [ac.createStereoPanner().pan];
     default:
       ok(false, `non-defined node type ${nodeType}.`);
-      return [];
+      return;
   }
 }
 
diff --git a/dom/media/test/test_autoplay_policy_web_audio_createMediaStreamSource.html b/dom/media/test/test_autoplay_policy_web_audio_createMediaStreamSource.html
index 33efa3e5e702..d5a12a2b9f3f 100644
--- a/dom/media/test/test_autoplay_policy_web_audio_createMediaStreamSource.html
+++ b/dom/media/test/test_autoplay_policy_web_audio_createMediaStreamSource.html
@@ -46,7 +46,6 @@ function setupTestPreferences() {
 }
 
 function createAudioContexts() {
-  /* global ac1, ac2 */
   window.ac1 = new AudioContext();
   window.ac2 = new AudioContext();
 
diff --git a/dom/media/test/test_autoplay_policy_web_audio_mediaElementAudioSourceNode.html b/dom/media/test/test_autoplay_policy_web_audio_mediaElementAudioSourceNode.html
index 18c376638219..ccc353f64674 100644
--- a/dom/media/test/test_autoplay_policy_web_audio_mediaElementAudioSourceNode.html
+++ b/dom/media/test/test_autoplay_policy_web_audio_mediaElementAudioSourceNode.html
@@ -49,7 +49,6 @@ function setupTestPreferences() {
 }
 
 function createAudioContext() {
-  /* global ac */
   window.ac = new AudioContext();
 
   ac.allowedToStart = new Promise(resolve => {
diff --git a/dom/media/test/test_autoplay_policy_web_audio_notResumePageInvokedSuspendedAudioContext.html b/dom/media/test/test_autoplay_policy_web_audio_notResumePageInvokedSuspendedAudioContext.html
index 1c0fcb37bbf1..bf765f82b69c 100644
--- a/dom/media/test/test_autoplay_policy_web_audio_notResumePageInvokedSuspendedAudioContext.html
+++ b/dom/media/test/test_autoplay_policy_web_audio_notResumePageInvokedSuspendedAudioContext.html
@@ -49,7 +49,6 @@ function setupTestPreferences() {
 }
 
 async function createAudioContext() {
-  /* global ac */
   window.ac = new AudioContext();
   await once(ac, "blocked");
   is(ac.state, "suspended", `AudioContext is blocked.`);
diff --git a/dom/media/test/test_background_video_drawimage_with_suspended_video.html b/dom/media/test/test_background_video_drawimage_with_suspended_video.html
index 32bda51dbffe..b4354b6bdc6d 100644
--- a/dom/media/test/test_background_video_drawimage_with_suspended_video.html
+++ b/dom/media/test/test_background_video_drawimage_with_suspended_video.html
@@ -17,7 +17,9 @@ var manager = new MediaTestManager;
 
 function drawVideoToCanvas(v) {
   console.log('drawVideoToCanvas');
-  let c = document.createElement('canvas');
+  let w = v.width,
+      h = v.height,
+      c = document.createElement('canvas');
   c.width = 4;
   c.height = 4;
   c.style.width = 64;
@@ -73,4 +75,4 @@ startTest({
       });
   }
 });
-</script>
+</script>
\ No newline at end of file
diff --git a/dom/media/test/test_background_video_suspend.html b/dom/media/test/test_background_video_suspend.html
index a6a720ad1341..c5461c2eb84a 100644
--- a/dom/media/test/test_background_video_suspend.html
+++ b/dom/media/test/test_background_video_suspend.html
@@ -76,6 +76,6 @@
       ["privacy.reduceTimerPrecision", false]
     ],
     tests: gDecodeSuspendTests,
-    runTest
+    runTest: runTest
   });
 </script>
\ No newline at end of file
diff --git a/dom/media/test/test_background_video_suspend_ends.html b/dom/media/test/test_background_video_suspend_ends.html
index c16ffff290fc..26180c586a0f 100644
--- a/dom/media/test/test_background_video_suspend_ends.html
+++ b/dom/media/test/test_background_video_suspend_ends.html
@@ -50,6 +50,6 @@
       ["media.suspend-bkgnd-video.delay-ms", 1000]
     ],
     tests: gDecodeSuspendTests,
-    runTest
+    runTest: runTest
   });
 </script>
\ No newline at end of file
diff --git a/dom/media/test/test_background_video_tainted_by_capturestream.html b/dom/media/test/test_background_video_tainted_by_capturestream.html
index 5cbb40f3f771..64fdad3b15de 100644
--- a/dom/media/test/test_background_video_tainted_by_capturestream.html
+++ b/dom/media/test/test_background_video_tainted_by_capturestream.html
@@ -11,7 +11,7 @@
 var manager = new MediaTestManager;
 
 function captureVideoAsStream(v) {
-  v.mozCaptureStream();
+  let stream = v.mozCaptureStream();
 }
 
 startTest({
@@ -43,4 +43,4 @@ startTest({
       });
   }
 });
-</script>
+</script>
\ No newline at end of file
diff --git a/dom/media/test/test_buffered.html b/dom/media/test/test_buffered.html
index 86d8eec28aa1..88bc0766396c 100644
--- a/dom/media/test/test_buffered.html
+++ b/dom/media/test/test_buffered.html
@@ -36,32 +36,32 @@ function testBuffered(e) {
   var caught = false;
   try {
     b.start(-1);
-  } catch (ex) {
-    caught = ex.name == "IndexSizeError" && ex.code == DOMException.INDEX_SIZE_ERR;
+  } catch (e) {
+    caught = e.name == "IndexSizeError" && e.code == DOMException.INDEX_SIZE_ERR;
   }
   is(caught, true, v._name + ": Should throw INDEX_SIZE_ERR on under start bounds range");
 
   caught = false;
   try {
     b.end(-1);
-  } catch (ex) {
-    caught = ex.name == "IndexSizeError" && ex.code == DOMException.INDEX_SIZE_ERR;
+  } catch (e) {
+    caught = e.name == "IndexSizeError" && e.code == DOMException.INDEX_SIZE_ERR;
   }
   is(caught, true, v._name + ": Should throw INDEX_SIZE_ERR on under end bounds range");
 
   caught = false;
   try {
     b.start(b.length);
-  } catch (ex) {
-    caught = ex.name == "IndexSizeError" && ex.code == DOMException.INDEX_SIZE_ERR;
+  } catch (e) {
+    caught = e.name == "IndexSizeError" && e.code == DOMException.INDEX_SIZE_ERR;
   }
   is(caught, true, v._name + ": Should throw INDEX_SIZE_ERR on over start bounds range");
 
   caught = false;
   try {
     b.end(b.length);
-  } catch (ex) {
-    caught = ex.name == "IndexSizeError" && ex.code == DOMException.INDEX_SIZE_ERR;
+  } catch (e) {
+    caught = e.name == "IndexSizeError" && e.code == DOMException.INDEX_SIZE_ERR;
   }
   is(caught, true, v._name + ": Should throw INDEX_SIZE_ERR on over end bounds range");
 
diff --git a/dom/media/test/test_bug1248229.html b/dom/media/test/test_bug1248229.html
index 316579562233..17aaddf90136 100644
--- a/dom/media/test/test_bug1248229.html
+++ b/dom/media/test/test_bug1248229.html
@@ -13,7 +13,6 @@
 SimpleTest.waitForExplicitFinish();
 
 function doTest() {
-  /* global v */
   window.oak = v.mozCaptureStreamUntilEnded();
   v.mozCaptureStreamUntilEnded();
   v.play();
diff --git a/dom/media/test/test_bug1431810_opus_downmix_to_mono.html b/dom/media/test/test_bug1431810_opus_downmix_to_mono.html
index 647ddf048964..a83ae31451b1 100644
--- a/dom/media/test/test_bug1431810_opus_downmix_to_mono.html
+++ b/dom/media/test/test_bug1431810_opus_downmix_to_mono.html
@@ -16,8 +16,6 @@
 */
 SimpleTest.waitForExplicitFinish();
 
-/* global a, b */
-
 function areChannelsInverted(b1, b2) {
   for (var i = 0; i < b1.length; i++) {
     if (Math.abs(b1[i] + b2[i]) > 9e-2) {
diff --git a/dom/media/test/test_bug1512958.html b/dom/media/test/test_bug1512958.html
index 2513515542fd..df81c5a987f7 100644
--- a/dom/media/test/test_bug1512958.html
+++ b/dom/media/test/test_bug1512958.html
@@ -27,7 +27,7 @@ for (let ev of events) {
   a.addEventListener(ev, dumpEvent);
 }
 
-(async () => {
+(async _ => {
   try {
     SimpleTest.waitForExplicitFinish();
     SimpleTest.requestFlakyTimeout("Timeouts for shortcutting test-timeout");
@@ -42,7 +42,7 @@ for (let ev of events) {
     a.src = test.name;
     a.name = test.name;
     const ac = new AudioContext();
-    ac.createMediaElementSource(a);
+    const src = ac.createMediaElementSource(a);
     a.play();
     do {
       await new Promise(r => a.ontimeupdate = r);
@@ -60,7 +60,7 @@ for (let ev of events) {
     a.currentTime = test.duration - 1;
     await Promise.race([
       new Promise(res => a.onended = res),
-      wait(30000).then(() => Promise.reject(new Error("Timeout"))),
+      wait(30000).then(_ => Promise.reject(new Error("Timeout"))),
     ]);
   } catch(e) {
     ok(false, e);
diff --git a/dom/media/test/test_bug463162.xhtml b/dom/media/test/test_bug463162.xhtml
index a84b3488d1bc..539c9f3e0a65 100644
--- a/dom/media/test/test_bug463162.xhtml
+++ b/dom/media/test/test_bug463162.xhtml
@@ -6,8 +6,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=463162
 -->
 <head>
   <title>Test for Bug 463162</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script src="/tests/SimpleTest/EventUtils.js"></script>
+  <script src="/tests/SimpleTest/SimpleTest.js"></script>        
+  <script src="/tests/SimpleTest/EventUtils.js"/>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
   <script type="text/javascript" src="manifest.js"></script>
 </head>
diff --git a/dom/media/test/test_bug686942.html b/dom/media/test/test_bug686942.html
index 66b48d69f02b..771dc645fb3e 100644
--- a/dom/media/test/test_bug686942.html
+++ b/dom/media/test/test_bug686942.html
@@ -21,7 +21,7 @@ function onloaded(event) {
   var v = event.target;
   v.removeEventListener("loadedmetadata", onloaded);
   v.currentTime = v.duration;
-  
+  return;
 }
 
 function checkNotPlaying(v) {
diff --git a/dom/media/test/test_bug895305.html b/dom/media/test/test_bug895305.html
index 56ed3c775c36..4bbe2cce30db 100644
--- a/dom/media/test/test_bug895305.html
+++ b/dom/media/test/test_bug895305.html
@@ -22,7 +22,6 @@ SimpleTest.waitForExplicitFinish();
 var audio = document.createElement("audio");
 
 // Check leaking on TextTrackList objects.
-/* global ttl, ttc */
 window.ttl = audio.textTracks;
 ttl.addEventListener("click", function(){});
 
diff --git a/dom/media/test/test_can_play_type_mpeg.html b/dom/media/test/test_can_play_type_mpeg.html
index f4f6fa4d74d0..99b4586f0274 100644
--- a/dom/media/test/test_can_play_type_mpeg.html
+++ b/dom/media/test/test_can_play_type_mpeg.html
@@ -131,7 +131,11 @@ function IsLinux() {
 }
 
 function getPref(name) {
-  return SpecialPowers.getBoolPref(name, false);
+  var pref = false;
+  try {
+    pref = SpecialPowers.getBoolPref(name);
+  } catch(ex) { }
+  return pref;
 }
 
 function IsSupportedAndroid() {
diff --git a/dom/media/test/test_cloneElementVisually_ended_video.html b/dom/media/test/test_cloneElementVisually_ended_video.html
index 844287f70503..fc341645c696 100644
--- a/dom/media/test/test_cloneElementVisually_ended_video.html
+++ b/dom/media/test/test_cloneElementVisually_ended_video.html
@@ -21,8 +21,6 @@
 
 <script type="application/javascript">
 
-/* import-globals-from cloneElementVisually_helpers.js */
-
 /**
  * Test that when we start cloning a video that has already ended, the
  * clone displays the last frame from the video.
diff --git a/dom/media/test/test_cloneElementVisually_mediastream.html b/dom/media/test/test_cloneElementVisually_mediastream.html
index 0c76c734e938..ea1219de1ef9 100644
--- a/dom/media/test/test_cloneElementVisually_mediastream.html
+++ b/dom/media/test/test_cloneElementVisually_mediastream.html
@@ -23,8 +23,6 @@
 
 <script type="application/javascript">
 
-/* import-globals-from cloneElementVisually_helpers.js */
-
 /**
  * Test that we can clone a video that is playing a MediaStream.
  */
diff --git a/dom/media/test/test_cloneElementVisually_no_suspend.html b/dom/media/test/test_cloneElementVisually_no_suspend.html
index d576bf8ab3af..5102685f4404 100644
--- a/dom/media/test/test_cloneElementVisually_no_suspend.html
+++ b/dom/media/test/test_cloneElementVisually_no_suspend.html
@@ -23,8 +23,6 @@
 
 <script type="application/javascript">
 
-/* import-globals-from cloneElementVisually_helpers.js */
-
 /**
  * Tests that cloning a video prevents the decoder from being suspended
  * if the original video stops being visible.
diff --git a/dom/media/test/test_cloneElementVisually_paused.html b/dom/media/test/test_cloneElementVisually_paused.html
index 981535fdc640..9c491567c5f8 100644
--- a/dom/media/test/test_cloneElementVisually_paused.html
+++ b/dom/media/test/test_cloneElementVisually_paused.html
@@ -21,8 +21,6 @@
 
 <script type="application/javascript">
 
-/* import-globals-from cloneElementVisually_helpers.js */
-
 /**
  * Test that when we start cloning a paused video, the clone displays
  * the first paused frame.
diff --git a/dom/media/test/test_cloneElementVisually_poster.html b/dom/media/test/test_cloneElementVisually_poster.html
index e7ba00edb091..8c138e0ac819 100644
--- a/dom/media/test/test_cloneElementVisually_poster.html
+++ b/dom/media/test/test_cloneElementVisually_poster.html
@@ -21,8 +21,6 @@
 
 <script type="application/javascript">
 
-/* import-globals-from cloneElementVisually_helpers.js */
-
 /**
  * Test that when we start cloning a paused video, the clone displays
  * the first paused frame.
diff --git a/dom/media/test/test_cloneElementVisually_resource_change.html b/dom/media/test/test_cloneElementVisually_resource_change.html
index 3a66906ea260..9cb815f4c5d8 100644
--- a/dom/media/test/test_cloneElementVisually_resource_change.html
+++ b/dom/media/test/test_cloneElementVisually_resource_change.html
@@ -23,8 +23,6 @@
 
 <script type="application/javascript">
 
-/* import-globals-from cloneElementVisually_helpers.js */
-
 /**
  * Tests that cloning survives changes to the underlying video resource.
  */
diff --git a/dom/media/test/test_clone_media_element.html b/dom/media/test/test_clone_media_element.html
index 35e5cd69d03a..ea0b07c5e6cd 100644
--- a/dom/media/test/test_clone_media_element.html
+++ b/dom/media/test/test_clone_media_element.html
@@ -30,17 +30,17 @@ function startTest(test, token) {
     clone.token = evt.target.token;
     clone.play();
 
-    clone.onloadstart = function(event) {
-      info("cloned " + event.target.token + " start loading.");
-      event.target.onloadstart = null;
+    clone.onloadstart = function(evt) {
+      info("cloned " + evt.target.token + " start loading.");
+      evt.target.onloadstart = null;
       removeNodeAndSource(v);
     }
 
-    clone.onended = function(event) {
-      ok(true, "cloned " + event.target.token + " ended.");
-      event.target.onended = null;
-      removeNodeAndSource(event.target);
-      manager.finished(event.target.token);
+    clone.onended = function(evt) {
+      ok(true, "cloned " + evt.target.token + " ended.");
+      evt.target.onended = null;
+      removeNodeAndSource(evt.target);
+      manager.finished(evt.target.token);
     }
   }
 }
diff --git a/dom/media/test/test_cueless_webm_seek-1.html b/dom/media/test/test_cueless_webm_seek-1.html
index db58a89665ab..8b7769487f15 100644
--- a/dom/media/test/test_cueless_webm_seek-1.html
+++ b/dom/media/test/test_cueless_webm_seek-1.html
@@ -42,7 +42,7 @@ function testWebM1(e) {
   ok(v.buffered.length >= 1, "Should have a buffered range");
   var halfBuffered = v.buffered.end(0) / 2;
 
-  function start() {
+  function startTest() {
     is(v.seekable.start(0), v.buffered.start(0), "Seekable start should be buffered start");
     is(v.seekable.end(0), v.buffered.end(0), "Seekable end should be buffered end");
     ok(!completed, "Should not be completed yet");
@@ -51,8 +51,8 @@ function testWebM1(e) {
       v.seeking = true;
       readonly = v.seeking === false;
     }
-    catch(ex) {
-      readonly = "threw exception: " + ex;
+    catch(e) {
+      readonly = "threw exception: " + e;
     }
     is(readonly, true, "seeking should be readonly");
 
@@ -90,7 +90,7 @@ function testWebM1(e) {
   once(v, "seeking", seekStarted);
   once(v, "seeked", seekEnded);
 
-  start();
+  startTest();
 }
 
 // Fetch the media resource using XHR so we can be sure the entire
@@ -133,4 +133,4 @@ manager.runTests(gCuelessWebMTests, startTest);
 </script>
 </pre>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/dom/media/test/test_cueless_webm_seek-2.html b/dom/media/test/test_cueless_webm_seek-2.html
index 720cc1839949..363716f5533d 100644
--- a/dom/media/test/test_cueless_webm_seek-2.html
+++ b/dom/media/test/test_cueless_webm_seek-2.html
@@ -39,7 +39,7 @@ function testWebM2(e) {
   ok(v.buffered.length >= 1, "Should have a buffered range");
   var halfBuffered = v.buffered.end(0) / 2;
 
-  function start() {
+  function startTest() {
     if (completed)
       return;
 
@@ -80,7 +80,7 @@ function testWebM2(e) {
   v.addEventListener("seeking", seekStarted);
   v.addEventListener("seeked", seekEnded);
 
-  start();
+  startTest();
 }
 
 // Fetch the media resource using XHR so we can be sure the entire
@@ -123,4 +123,4 @@ manager.runTests(gCuelessWebMTests, startTest);
 </script>
 </pre>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/dom/media/test/test_cueless_webm_seek-3.html b/dom/media/test/test_cueless_webm_seek-3.html
index d6e3e50d7d9e..579c3565a729 100644
--- a/dom/media/test/test_cueless_webm_seek-3.html
+++ b/dom/media/test/test_cueless_webm_seek-3.html
@@ -32,13 +32,14 @@ function testWebM3(e) {
   var v = e.target;
   v.removeEventListener('loadeddata', testWebM3);
 
+  var startPassed = false;
   var completed = false;
   var gotTimeupdate = false;
 
   ok(v.buffered.length >= 1, "Should have a buffered range");
   var halfBuffered = v.buffered.end(0) / 2;
 
-  function start() {
+  function startTest() {
     if (completed)
       return;
 
@@ -57,6 +58,7 @@ function testWebM3(e) {
       return;
 
     v.addEventListener("timeupdate", timeupdate);
+    startPassed = true;
   }
 
   function seekEnded() {
@@ -74,7 +76,7 @@ function testWebM3(e) {
   v.addEventListener("seeking", seekStarted);
   v.addEventListener("seeked", seekEnded);
 
-  start()
+  startTest()
 }
 
 // Fetch the media resource using XHR so we can be sure the entire
@@ -117,4 +119,4 @@ manager.runTests(gCuelessWebMTests, startTest);
 </script>
 </pre>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/dom/media/test/test_decoder_disable.html b/dom/media/test/test_decoder_disable.html
index dd0d2cc51b9e..f875ac1f25f5 100644
--- a/dom/media/test/test_decoder_disable.html
+++ b/dom/media/test/test_decoder_disable.html
@@ -24,11 +24,11 @@ function e(id) {
   return document.getElementById(id);
 }
 
-var gLoadError = {};
+var gLoadError = new Object();
 
-gLoadError.video1 = 0;
-gLoadError.video2 = 0;
-gLoadError.video3 = 0;
+gLoadError['video1'] = 0; 
+gLoadError['video2'] = 0;
+gLoadError['video3'] = 0;
 
 var gErrorCount = 0;
 
@@ -45,9 +45,9 @@ function finishTest() {
      filename(e('video3').src),
      'video3 currentSrc should match src');
 
-  is(gLoadError.video1, 2, "Expect one error per invalid source child on video1");
-  is(gLoadError.video2, 1, "Expect one error on video2");
-  is(gLoadError.video3, 1, "Expect one error on video3");
+  is(gLoadError['video1'], 2, "Expect one error per invalid source child on video1");
+  is(gLoadError['video2'], 1, "Expect one error on video2");
+  is(gLoadError['video3'], 1, "Expect one error on video3");
 
   SimpleTest.finish();
 }
diff --git a/dom/media/test/test_eme_autoplay.html b/dom/media/test/test_eme_autoplay.html
index 010995c095e4..ebe370d47195 100644
--- a/dom/media/test/test_eme_autoplay.html
+++ b/dom/media/test/test_eme_autoplay.html
@@ -10,7 +10,6 @@
 <body>
 <pre id="test">
 <script class="testbody" type="text/javascript">
-/* import-globals-from eme.js */
 var manager = new MediaTestManager;
 
 var EMEmanifest = [
@@ -45,8 +44,8 @@ function startTest(test, token)
 
   var eventCounts = { play: 0, playing: 0};
   function ForbiddenEvents(e) {
-    var video = e.target;
-    ok(video.readyState >= video.HAVE_FUTURE_DATA, "Must not have received event too early");
+    var v = e.target;
+    ok(v.readyState >= v.HAVE_FUTURE_DATA, "Must not have received event too early");
     is(eventCounts[e.type], 0, "event should have only be fired once");
     eventCounts[e.type]++;
   }
diff --git a/dom/media/test/test_eme_detach_reattach_same_mediakeys_during_playback.html b/dom/media/test/test_eme_detach_reattach_same_mediakeys_during_playback.html
index 0e379a0e5ace..35d92052478d 100644
--- a/dom/media/test/test_eme_detach_reattach_same_mediakeys_during_playback.html
+++ b/dom/media/test/test_eme_detach_reattach_same_mediakeys_during_playback.html
@@ -11,7 +11,6 @@
 <pre id="test">
 <video id="v" controls></video>
 <script class="testbody" type="text/javascript">
-/* import-globals-from eme.js */
 var manager = new MediaTestManager;
 
 var EMEmanifest = [
diff --git a/dom/media/test/test_eme_non_mse_fails.html b/dom/media/test/test_eme_non_mse_fails.html
index 1c4f24c0dc62..23bbbda1f35b 100644
--- a/dom/media/test/test_eme_non_mse_fails.html
+++ b/dom/media/test/test_eme_non_mse_fails.html
@@ -10,10 +10,9 @@
 <body>
 <pre id="test">
 <script class="testbody" type="text/javascript">
-/* import-globals-from eme.js */
 var manager = new MediaTestManager;
 
-function DoSetMediaKeys(v, test, token)
+function DoSetMediaKeys(v, test)
 {
   var options = [{
     initDataTypes: ["cenc"],
@@ -70,7 +69,7 @@ function TestSetSrc(test, token)
     manager.finished(token);
   });
 
-  DoSetMediaKeys(v, test, token)
+  DoSetMediaKeys(v, test)
 
   .then(function() {
     v.src = test.name;
@@ -101,3 +100,4 @@ if (!IsMacOSSnowLeopardOrEarlier()) {
 </pre>
 </body>
 </html>
+
diff --git a/dom/media/test/test_eme_playback.html b/dom/media/test/test_eme_playback.html
index 11b4f76334ab..05d5132a8cd8 100644
--- a/dom/media/test/test_eme_playback.html
+++ b/dom/media/test/test_eme_playback.html
@@ -10,7 +10,6 @@
 <body>
 <pre id="test">
 <script class="testbody" type="text/javascript">
-/* import-globals-from eme.js */
 var manager = new MediaTestManager;
 
 function ArrayBuffersEqual(a, b) {
@@ -34,12 +33,12 @@ function KeysChangeFunc(session, keys, token) {
     session.keyIdsReceived[keyid] = false;
   }
   return function(ev) {
-    var s = ev.target;
-    s.gotKeysChanged = true;
+    var session = ev.target;
+    session.gotKeysChanged = true;
 
     var keyList = [];
     var valueList = [];
-    var map = s.keyStatuses;
+    var map = session.keyStatuses;
 
     // Test that accessing keys not known to the CDM has expected behaviour.
     var absentKey = new Uint8Array([0xeb, 0xdd, 0x62, 0xf1, 0x68, 0x14, 0xd2, 0x7b,
@@ -48,7 +47,7 @@ function KeysChangeFunc(session, keys, token) {
     is(map.get(absentKey), undefined, "Unknown keys should undefined status");
 
     // Verify known keys have expected status.
-    for (let [key, val] of map.entries()) {
+    for (var [key, val] of map.entries()) {
       is(key.constructor, ArrayBuffer, "keyId should be ArrayBuffer");
       ok(map.has(key), "MediaKeyStatusMap.has() should work.");
       is(map.get(key), val, "MediaKeyStatusMap.get() should work.");
@@ -56,8 +55,8 @@ function KeysChangeFunc(session, keys, token) {
       valueList.push(val);
       is(val, "usable", token + ": key status should be usable");
       var kid = Base64ToHex(window.btoa(ArrayBufferToString(key)));
-      ok(kid in s.keyIdsReceived, TimeStamp(token) + " session[" + s.sessionId + "].keyIdsReceived contained " + kid + " as expected.");
-      s.keyIdsReceived[kid] = true;
+      ok(kid in session.keyIdsReceived, TimeStamp(token) + " session[" + session.sessionId + "].keyIdsReceived contained " + kid + " as expected.");
+      session.keyIdsReceived[kid] = true;
     }
 
     var index = 0;
@@ -66,7 +65,7 @@ function KeysChangeFunc(session, keys, token) {
       index++;
     }
     index = 0;
-    for (let val of map.values()) {
+    for (var val of map.values()) {
       is(val, valueList[index], "MediaKeyStatusMap.values() should correspond to entries");
       index++;
     }
@@ -143,7 +142,7 @@ function startTest(test, token)
       ok(session.gotKeysChanged,
          TimeStamp(token) + " session[" + session.sessionId
          + "] should have received at least one keychange event");
-      for (let kid in session.keyIdsReceived) {
+      for (var kid in session.keyIdsReceived) {
         Log(token, "session[" + session.sessionId + "] key " + kid + " = " + (session.keyIdsReceived[kid] ? "true" : "false"));
         if (session.keyIdsReceived[kid]) { keyIdsReceived[kid] = true; }
       }
@@ -155,7 +154,7 @@ function startTest(test, token)
       is(session.numMessageEvents, session.numOnMessageEvents,
          TimeStamp(token) + " should have as many message event listener calls as event handler calls.");
     }
-    for (let kid in keyIdsReceived) {
+    for (var kid in keyIdsReceived) {
       ok(keyIdsReceived[kid], TimeStamp(token) + " key with id " + kid + " was usable as expected");
     }
 
diff --git a/dom/media/test/test_eme_pssh_in_moof.html b/dom/media/test/test_eme_pssh_in_moof.html
index 723c20810fb6..cb3799ab045c 100644
--- a/dom/media/test/test_eme_pssh_in_moof.html
+++ b/dom/media/test/test_eme_pssh_in_moof.html
@@ -109,15 +109,15 @@
         Log(token, "encrypted event => len=" + initData.length + " " + hexStr);
         let session = event.target.mediaKeys.createSession();
         initDatas.set(hexStr, session);
-        session.addEventListener("message", e => {
-          e.target.update(
+        session.addEventListener("message", event => {
+          event.target.update(
             GenerateClearKeyLicense(event.message, test.keys));
         });
 
         session.generateRequest(event.initDataType, event.initData);
       }
 
-      video.addEventListener("encrypted", handleEncrypted);
+      video.addEventListener("encrypted", handleEncrypted, false);
 
       video.addEventListener("ended", () => {
         let expectedEncryptedEvents =
@@ -138,4 +138,4 @@
 
     </script>
   </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/dom/media/test/test_eme_request_notifications.html b/dom/media/test/test_eme_request_notifications.html
index b3c62c9cf632..441b27e8affd 100644
--- a/dom/media/test/test_eme_request_notifications.html
+++ b/dom/media/test/test_eme_request_notifications.html
@@ -28,6 +28,7 @@ function observe() {
 
 function Test(test) {
   var p = test.prefs ? SetPrefs(test.prefs) : Promise.resolve();
+  observedStatus = "nothing";
   var name = "'" + test.keySystem + "'";
 
   var res = observe().then((status) => {
diff --git a/dom/media/test/test_eme_stream_capture_blocked_case1.html b/dom/media/test/test_eme_stream_capture_blocked_case1.html
index bdfbc8d4f8cc..60a7f22c7c49 100644
--- a/dom/media/test/test_eme_stream_capture_blocked_case1.html
+++ b/dom/media/test/test_eme_stream_capture_blocked_case1.html
@@ -15,6 +15,7 @@ var manager = new MediaTestManager;
 function startTest(test, token)
 {
   // Case 1. setting MediaKeys on an element captured by MediaElementSource should fail.
+  var p1 = new EMEPromise;
   var case1token = token + "_case1";
   let v1 = document.createElement("video");
 
@@ -34,7 +35,7 @@ function startTest(test, token)
   }
 
   var context = new AudioContext();
-  context.createMediaElementSource(v1);
+  var node = context.createMediaElementSource(v1);
   v1.addEventListener("loadeddata", function(ev) {
     ok(false, TimeStamp(case1token) + " should never reach loadeddata, as setMediaKeys should fail");
   });
diff --git a/dom/media/test/test_eme_stream_capture_blocked_case2.html b/dom/media/test/test_eme_stream_capture_blocked_case2.html
index 1c87e63e3e18..6a75fd822e5b 100644
--- a/dom/media/test/test_eme_stream_capture_blocked_case2.html
+++ b/dom/media/test/test_eme_stream_capture_blocked_case2.html
@@ -25,7 +25,7 @@ function startTest(test, token)
     var threw = false;
     try {
       var context = new AudioContext();
-      context.createMediaElementSource(v2);
+      var node = context.createMediaElementSource(v2);
     } catch (e) {
       threw = true;
     }
diff --git a/dom/media/test/test_eme_stream_capture_blocked_case3.html b/dom/media/test/test_eme_stream_capture_blocked_case3.html
index 1b50e6bab28a..e128e2bf2e26 100644
--- a/dom/media/test/test_eme_stream_capture_blocked_case3.html
+++ b/dom/media/test/test_eme_stream_capture_blocked_case3.html
@@ -23,7 +23,7 @@ function startTest(test, token)
     ok(true, TimeStamp(case3token) + " should reach loadeddata");
     var threw = false;
     try {
-      v3.mozCaptureStreamUntilEnded();
+      var stream = v3.mozCaptureStreamUntilEnded();
     } catch (e) {
       threw = true;
     }
diff --git a/dom/media/test/test_eme_unsetMediaKeys_then_capture.html b/dom/media/test/test_eme_unsetMediaKeys_then_capture.html
index c3691fe71cb3..e7bb33d976c5 100644
--- a/dom/media/test/test_eme_unsetMediaKeys_then_capture.html
+++ b/dom/media/test/test_eme_unsetMediaKeys_then_capture.html
@@ -10,7 +10,6 @@
 <body>
 <pre id="test">
 <script class="testbody" type="text/javascript">
-/* import-globals-from eme.js */
 var manager = new MediaTestManager;
 
 // Test that if we can capture a video frame while playing clear content after
@@ -42,15 +41,15 @@ function startTest(test, token)
     function playClearVideo() {
       var p1 = once(v, 'loadeddata', (e) => {
         ok(true, TimeStamp(token) + " Receiving event 'loadeddata' for (CLEAR) content.");
-        let canvasElem = document.createElement('canvas');
+        canvasElem = document.createElement('canvas');
         document.body.appendChild(canvasElem);
-        let ctx2d = canvasElem.getContext('2d');
+        ctx2d = canvasElem.getContext('2d');
 
         var gotTypeError = false;
         try {
           ctx2d.drawImage(v, 0, 0);
-        } catch (ex) {
-          if (ex instanceof TypeError) {
+        } catch (e) {
+          if (e instanceof TypeError) {
             gotTypeError = true;
           }
         }
diff --git a/dom/media/test/test_eme_waitingforkey.html b/dom/media/test/test_eme_waitingforkey.html
index 21c89eaa0098..2119ef07077b 100644
--- a/dom/media/test/test_eme_waitingforkey.html
+++ b/dom/media/test/test_eme_waitingforkey.html
@@ -10,7 +10,6 @@
 <body>
 <pre id="test">
 <script class="testbody" type="text/javascript">
-/* import-globals-from eme.js */
 var manager = new MediaTestManager;
 
 function startTest(test, token)
diff --git a/dom/media/test/test_fastSeek-forwards.html b/dom/media/test/test_fastSeek-forwards.html
index 1e50021b1391..9760e25bd7ec 100644
--- a/dom/media/test/test_fastSeek-forwards.html
+++ b/dom/media/test/test_fastSeek-forwards.html
@@ -57,7 +57,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1022913
 
     function startTest(test, token) {
       manager.started(token);
-      let v = document.createElement("video");
+      v = document.createElement("video");
       v.src = test.name;
       v.name = test.name;
       v.preload = "metadata";
diff --git a/dom/media/test/test_fastSeek.html b/dom/media/test/test_fastSeek.html
index e3078c6c4e40..880d17d88431 100644
--- a/dom/media/test/test_fastSeek.html
+++ b/dom/media/test/test_fastSeek.html
@@ -67,7 +67,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=778077
 
     function startTest(test, token) {
       manager.started(token);
-      let v = document.createElement("video");
+      v = document.createElement("video");
       v.src = test.name;
       v.name = test.name;
       v.preload = "metadata";
diff --git a/dom/media/test/test_fragment_noplay.html b/dom/media/test/test_fragment_noplay.html
index 6a1119f3426a..bad9de3ffbf7 100644
--- a/dom/media/test/test_fragment_noplay.html
+++ b/dom/media/test/test_fragment_noplay.html
@@ -85,7 +85,7 @@ function createTestArray() {
 
     for (var fragNum=0; fragNum<gFragmentParams.length; fragNum++) {
       var p = gFragmentParams[fragNum];
-      var t = {};
+      var t = new Object;
       t.name = test.name + p.fragment;
       t.type = test.type;
       t.duration = test.duration;
@@ -98,25 +98,25 @@ function createTestArray() {
 }
 
 function startTest(test, token) {
-  var video = document.createElement('video');
+  var v = document.createElement('video');
   manager.started(token);
-  video.preload = "metadata";
-  video.src = test.name;
-  video.token = token;
-  video.controls = true;
-  document.body.appendChild(video);
+  v.preload = "metadata";
+  v.src = test.name;
+  v.token = token;
+  v.controls = true;
+  document.body.appendChild(v);
   var name = test.name + " fragment test";
-  var localIs = function(n) { return function(a, b, msg) {
-    is(a, b, n + ": " + msg);
+  var localIs = function(name) { return function(a, b, msg) {
+    is(a, b, name + ": " + msg);
   }}(name);
-  var localOk = function(n) { return function(a, msg) {
-    ok(a, n + ": " + msg);
+  var localOk = function(name) { return function(a, msg) {
+    ok(a, name + ": " + msg);
   }}(name);
-  var localFinish = function(v, m) { return function() {
+  var localFinish = function(v, manager) { return function() {
     removeNodeAndSource(v);
-    m.finished(v.token);
-  }}(video, manager);
-  window.test_fragment_noplay(video, test.start, test.end, localIs, localOk, localFinish);
+    manager.finished(v.token);
+  }}(v, manager);
+  window['test_fragment_noplay'](v, test.start, test.end, localIs, localOk, localFinish);
 }
 
 manager.runTests(createTestArray(), startTest);
diff --git a/dom/media/test/test_fragment_play.html b/dom/media/test/test_fragment_play.html
index eab422bab124..24d81265930c 100644
--- a/dom/media/test/test_fragment_play.html
+++ b/dom/media/test/test_fragment_play.html
@@ -44,7 +44,7 @@ function createTestArray() {
 
     for (var fragNum=0; fragNum<gFragmentParams.length; fragNum++) {
       var p = gFragmentParams[fragNum];
-      var t = {};
+      var t = new Object;
       t.name = test.name + p.fragment;
       t.type = test.type;
       t.duration = test.duration;
@@ -62,25 +62,25 @@ function startTest(test, token) {
     todo(false, test.todo);
     return;
   }
-  var video = document.createElement('video');
+  var v = document.createElement('video');
   manager.started(token);
-  video.preload = "metadata";
-  video.src = test.name;
-  video.token = token;
-  video.controls = true;
-  document.body.appendChild(video);
+  v.preload = "metadata";
+  v.src = test.name;
+  v.token = token;
+  v.controls = true;
+  document.body.appendChild(v);
   var name = test.name + " fragment test";
-  var localIs = function(n) { return function(a, b, msg) {
-    is(a, b, n + ": " + msg);
+  var localIs = function(name) { return function(a, b, msg) {
+    is(a, b, name + ": " + msg);
   }}(name);
-  var localOk = function(n) { return function(a, msg) {
-    ok(a, n + ": " + msg);
+  var localOk = function(name) { return function(a, msg) {
+    ok(a, name + ": " + msg);
   }}(name);
-  var localFinish = function(v, m) { return function() {
+  var localFinish = function(v, manager) { return function() {
     removeNodeAndSource(v);
-    m.finished(v.token);
-  }}(video, manager);
-  window.test_fragment_play(video, test.start, test.end, localIs, localOk, localFinish);
+    manager.finished(v.token);
+  }}(v, manager);
+  window['test_fragment_play'](v, test.start, test.end, localIs, localOk, localFinish);
 }
 
 manager.runTests(createTestArray(), startTest);
diff --git a/dom/media/test/test_info_leak.html b/dom/media/test/test_info_leak.html
index 41b01c74c1ba..7ef416ed0beb 100644
--- a/dom/media/test/test_info_leak.html
+++ b/dom/media/test/test_info_leak.html
@@ -13,7 +13,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=478957
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=478957">Mozilla Bug 478957</a>
 <p id="display"></p>
 <div id="content" style="display: none">
-
+  
 </div>
 
 <div id="log" style="font-size: small;"></div>
@@ -42,7 +42,7 @@ function createTestArray() {
         continue;
       }
 
-      var t = {};
+      var t = new Object;
       t.name = test.src;
       t.type = test.type;
 
@@ -55,7 +55,6 @@ function createTestArray() {
 function log(msg) {
   info(msg);
   var l = document.getElementById('log');
-  // eslint-disable-next-line no-unsanitized/property
   l.innerHTML += msg + "<br>";
 }
 
@@ -92,7 +91,7 @@ function listener(evt) {
     // other events to come in. Note: we don't expect any events to come
     // in, unless we've leaked some info, and 1 second should be enough time
     // for the leak to show up.
-    setTimeout(function() {finish(v);}, 1000);
+    setTimeout(function() {finish(v);}, 1000); 
   }
 }
 
@@ -135,7 +134,7 @@ function filename(uri) {
 }
 
 function checkState(v) {
-  test_ok(v.networkState <= HTMLMediaElement.NETWORK_LOADING ||
+  test_ok(v.networkState <= HTMLMediaElement.NETWORK_LOADING || 
           v.networkState == HTMLMediaElement.NETWORK_NO_SOURCE,
           "NetworkState of " + v.networkState + " was leaked.");
   test_ok(v.readyState == HTMLMediaElement.HAVE_NOTHING,
@@ -160,7 +159,7 @@ function checkState(v) {
 function startTest(test, token) {
   manager.started(token);
   log("Testing: " + test.type + " @ " + test.name);
-  createMedia(test.type, test.name, token);
+  createMedia(test.type, test.name, token);  
 }
 
 SimpleTest.waitForExplicitFinish();
diff --git a/dom/media/test/test_load.html b/dom/media/test/test_load.html
index de8fd6394862..00385eae8b4f 100644
--- a/dom/media/test/test_load.html
+++ b/dom/media/test/test_load.html
@@ -89,14 +89,16 @@ function prependSource(src, type) {
 var gTests = [
   {
     // Test 0: adding video to doc, then setting src should load implicitly.
-    create(src, type) {
+    create:
+      function(src, type) {
         document.body.appendChild(gMedia);
         gMedia.src = src;
       },
     expectedEvents: ['loadstart', 'durationchange', 'loadedmetadata', 'loadeddata']
   }, {
     // Test 1: adding video to doc, then adding source.
-    create(src, type) {
+    create:
+      function(src, type) {
         document.body.appendChild(gMedia);
         addSource(src, type);
       },
@@ -104,7 +106,8 @@ var gTests = [
   },{
     // Test 2: video with multiple source, the first of which are bad, we should load the last,
     // and receive error events for failed loads on the source children.
-    create(src, type) {
+    create:
+      function(src, type) {
         document.body.appendChild(gMedia);
         addSource("404a", type);
         addSource("404b", type);
@@ -113,7 +116,8 @@ var gTests = [
     expectedEvents: ['loadstart', 'source_error', 'source_error', 'durationchange', 'loadedmetadata', 'loadeddata']
   }, {
     // Test 3:  video with bad src, good <source>, ensure that <source> aren't used.
-    create(src, type) {
+    create:
+      function(src, type) {
         gMedia.src = "404a";
         addSource(src, type);
         document.body.appendChild(gMedia);
@@ -122,7 +126,8 @@ var gTests = [
   }, {
     // Test 4:  video with only bad source, loading, then adding a good source
     // -  should resume load.
-    create(src, type) {
+    create:
+      function(src, type) {
         addSource("404a", type);
         var s2 = addSource("404b", type);
         s2.addEventListener("error",
@@ -138,7 +143,8 @@ var gTests = [
     // a good <source> to the video, it shouldn't be selected, because the
     // "pointer" should be after the last child - the bad source.
     prepended: false,
-    create(src, type) {
+    create:
+      function(src, type) {
         var prepended = false;
         addSource("404a", type);
         var s2 = addSource("404b", type);
@@ -156,7 +162,8 @@ var gTests = [
   }, {
     // Test 6: (Bug 1165203) preload="none" then followed by an explicit
     // call to load() should load metadata
-    create(src, type) {
+    create:
+      function(src, type) {
         gMedia.preload = "none";
         gMedia.src = src;
         document.body.appendChild(gMedia);
diff --git a/dom/media/test/test_load_same_resource.html b/dom/media/test/test_load_same_resource.html
index d3e16c88a568..f75fd91a1653 100644
--- a/dom/media/test/test_load_same_resource.html
+++ b/dom/media/test/test_load_same_resource.html
@@ -38,11 +38,11 @@ function tryClone(e) {
                 "loadeddata", "playing", "ended", "error", "stalled", "emptied", "abort",
                 "waiting", "pause"];
   function logEvent(evt) {
-    var event = evt.target;
-    info(`${event.token} got ${evt.type}`);
+    var e = evt.target;
+    info(`${e.token} got ${evt.type}`);
   }
-  events.forEach(function(event) {
-    clone.addEventListener(event, logEvent);
+  events.forEach(function(e) {
+    clone.addEventListener(e, logEvent);
   });
 
 
diff --git a/dom/media/test/test_media_selection.html b/dom/media/test/test_media_selection.html
index a95267ed3842..6c2a02fd6547 100644
--- a/dom/media/test/test_media_selection.html
+++ b/dom/media/test/test_media_selection.html
@@ -107,8 +107,8 @@ for (var i = 0; i < gSmallTests.length; ++i) {
   // The following nested function hack is to ensure that 'test' is correctly
   // captured in the closure and we don't end up getting the value 'test'
   // had in the last iteration of the loop. I blame Brendan.
-  var check = function(t) { return function (e) {
-    checkMetadata(t.name, e, test);
+  var check = function(test) { return function (e) {
+    checkMetadata(test.name, e, test);
   }}(test);
 
   var otherType = type.match(/^video\//) ? "audio/x-wav" : "video/ogg";
@@ -130,8 +130,8 @@ for (var i = 0; i < gSmallTests.length; ++i) {
                 maketest(late_add_sources_first, src, type, check));
 }
 
-function startTest(t, token) {
-  t(token);
+function startTest(test, token) {
+  test(token);
 }
 
 manager.runTests(subtests, startTest);
diff --git a/dom/media/test/test_mediarecorder_bitrate.html b/dom/media/test/test_mediarecorder_bitrate.html
index 693b27e3bf6f..3eb918e775ac 100644
--- a/dom/media/test/test_mediarecorder_bitrate.html
+++ b/dom/media/test/test_mediarecorder_bitrate.html
@@ -24,6 +24,7 @@ function startTest(test, token) {
 
 function runTest(test, token, bitrate) {
   var element = document.createElement('video');
+  var expectedMimeType = test.type.substring(0, test.type.indexOf(';'));
 
   element.token = token;
 
diff --git a/dom/media/test/test_mediarecorder_pause_resume_video.html b/dom/media/test/test_mediarecorder_pause_resume_video.html
index bc8f4bc2364e..1ece65142dac 100644
--- a/dom/media/test/test_mediarecorder_pause_resume_video.html
+++ b/dom/media/test/test_mediarecorder_pause_resume_video.html
@@ -13,7 +13,6 @@
   <video id="recorded-video"></video>
 </div>
 <script class="testbody" type="text/javascript">
-/* import-globals-from ../../canvas/test/captureStream_common.js */
 
 function startTest() {
   // Setup canvas and take a stream from it
@@ -35,7 +34,7 @@ function startTest() {
   // Recorded data that will be playback.
   let blob;
 
-  let mediaRecorder = new MediaRecorder(canvasStream);
+  mediaRecorder = new MediaRecorder(canvasStream);
   is(mediaRecorder.stream, canvasStream,
      "Media recorder stream = canvas stream at the start of recording");
 
diff --git a/dom/media/test/test_mediarecorder_playback_can_repeat.html b/dom/media/test/test_mediarecorder_playback_can_repeat.html
index 0c584f68c2e0..dec4679a0d02 100644
--- a/dom/media/test/test_mediarecorder_playback_can_repeat.html
+++ b/dom/media/test/test_mediarecorder_playback_can_repeat.html
@@ -13,7 +13,6 @@
   <video id="recorded-video" loop></video>
 </div>
 <script class="testbody" type="text/javascript">
-/* import-globals-from ../../canvas/test/captureStream_common.js */
 
 function startTest() {
   let canvas = document.getElementById("video-src-canvas");
diff --git a/dom/media/test/test_mediarecorder_record_4ch_audiocontext.html b/dom/media/test/test_mediarecorder_record_4ch_audiocontext.html
index 99f57f181e6f..19518af2cf1f 100644
--- a/dom/media/test/test_mediarecorder_record_4ch_audiocontext.html
+++ b/dom/media/test/test_mediarecorder_record_4ch_audiocontext.html
@@ -27,13 +27,15 @@ function startTest() {
   var onstopTriggered = false;
   dest.channelCount = 4;
   var expectedMimeType = 'audio/ogg; codecs=opus';
+  var totalBlobSize = 0;
   source.channelCountMode = 'explicit';
   source.connect(dest);
   var elem = document.createElement('audio');
   elem.srcObject = dest.stream;
+  mMediaStream = dest.stream;
   source.start(0);
   elem.play();
-  let mMediaRecorder = new MediaRecorder(dest.stream);
+  mMediaRecorder = new MediaRecorder(dest.stream);
   mMediaRecorder.onwarning = function() {
     ok(false, 'onwarning unexpectedly fired');
   };
@@ -50,6 +52,7 @@ function startTest() {
   };
   mMediaRecorder.ondataavailable = function (e) {
     ok(e.data.size > 0, 'check blob has data');
+    totalBlobSize += e.data.size;
     is(e.data.type, expectedMimeType, 'blob should have expected mimetype');
     if (!stopTriggered) {
       is(mMediaRecorder.mimeType, expectedMimeType, 'recorder should have expected mimetype');
diff --git a/dom/media/test/test_mediarecorder_record_addtracked_stream.html b/dom/media/test/test_mediarecorder_record_addtracked_stream.html
index 38c099d1b4c2..a0d6d931b9a5 100644
--- a/dom/media/test/test_mediarecorder_record_addtracked_stream.html
+++ b/dom/media/test/test_mediarecorder_record_addtracked_stream.html
@@ -12,8 +12,6 @@
 <div id="content">
 </div>
 <script>
-/* import-globals-from ../../canvas/test/captureStream_common.js */
-/* import-globals-from ../tests/mochitest/head.js */
 SimpleTest.waitForExplicitFinish();
 runTestWhenReady(async () => {
   const canvas = document.createElement("canvas");
@@ -35,7 +33,7 @@ runTestWhenReady(async () => {
 
   const blobs = [];
 
-  let mediaRecorder = new MediaRecorder(stream);
+  mediaRecorder = new MediaRecorder(stream);
   is(mediaRecorder.stream, stream,
      "Media recorder stream = constructed stream at the start of recording");
 
diff --git a/dom/media/test/test_mediarecorder_record_audiocontext.html b/dom/media/test/test_mediarecorder_record_audiocontext.html
index 686faaeb6b7c..9b5fa4614042 100644
--- a/dom/media/test/test_mediarecorder_record_audiocontext.html
+++ b/dom/media/test/test_mediarecorder_record_audiocontext.html
@@ -12,6 +12,7 @@
 
 function startTest() {
   var context = new AudioContext();
+  var hasonstop = false;
   var buffer = context.createBuffer(1, 80920, context.sampleRate);
   for (var i = 0; i < 80920; ++i) {
     buffer.getChannelData(0)[i] = Math.sin(1000 * 2 * Math.PI * i / context.sampleRate);
@@ -25,9 +26,10 @@ function startTest() {
   source.connect(dest);
   var elem = document.createElement('audio');
   elem.srcObject = dest.stream;
+  mMediaStream = dest.stream;
   source.start(0);
   elem.play();
-  let mMediaRecorder = new MediaRecorder(dest.stream);
+  mMediaRecorder = new MediaRecorder(dest.stream);
   mMediaRecorder.onwarning = function() {
     ok(false, 'onwarning unexpectedly fired');
   };
diff --git a/dom/media/test/test_mediarecorder_record_canvas_captureStream.html b/dom/media/test/test_mediarecorder_record_canvas_captureStream.html
index cd4d2e4859b0..5639dd8a08b6 100644
--- a/dom/media/test/test_mediarecorder_record_canvas_captureStream.html
+++ b/dom/media/test/test_mediarecorder_record_canvas_captureStream.html
@@ -11,7 +11,6 @@
 <div id="content">
 </div>
 <script class="testbody" type="text/javascript">
-/* import-globals-from ../../canvas/test/captureStream_common.js */
 
 function startTest() {
   var canvas = document.createElement("canvas");
@@ -25,7 +24,7 @@ function startTest() {
 
   var blob;
 
-  let mediaRecorder = new MediaRecorder(stream);
+  mediaRecorder = new MediaRecorder(stream);
   is(mediaRecorder.stream, stream,
      "Media recorder stream = canvas stream at the start of recording");
 
diff --git a/dom/media/test/test_mediarecorder_record_downsize_resolution.html b/dom/media/test/test_mediarecorder_record_downsize_resolution.html
index 988bdea52929..f9422a38972e 100644
--- a/dom/media/test/test_mediarecorder_record_downsize_resolution.html
+++ b/dom/media/test/test_mediarecorder_record_downsize_resolution.html
@@ -11,7 +11,6 @@
 <div id="content">
 </div>
 <script class="testbody" type="text/javascript">
-/* import-globals-from ../../canvas/test/captureStream_common.js */
 
 function startTest() {
   var canvas = document.createElement("canvas");
diff --git a/dom/media/test/test_mediarecorder_record_gum_video_timeslice.html b/dom/media/test/test_mediarecorder_record_gum_video_timeslice.html
index 989c7fa1bfe7..b077ae723d02 100644
--- a/dom/media/test/test_mediarecorder_record_gum_video_timeslice.html
+++ b/dom/media/test/test_mediarecorder_record_gum_video_timeslice.html
@@ -20,7 +20,7 @@ async function startTest() {
     let onDataAvailableFirst = false;
     const expectedMimeType = 'video/webm; codecs="vp8, opus"';
 
-    let mediaRecorder = new MediaRecorder(stream);
+    mediaRecorder = new MediaRecorder(stream);
     is(mediaRecorder.stream, stream,
        'Media recorder stream = element stream at the start of recording');
     mediaRecorder.onwarning = function() {
@@ -49,7 +49,7 @@ async function startTest() {
 
       // We'll stop recording upon the 1st blob being received
       if (dataAvailableCount === 1) {
-        mediaRecorder.onstop = function (event) {
+        mediaRecorder.onstop = function (evt) {
           info('onstop fired');
 
           if (!onDataAvailableFirst) {
diff --git a/dom/media/test/test_mediarecorder_record_gum_video_timeslice_mixed.html b/dom/media/test/test_mediarecorder_record_gum_video_timeslice_mixed.html
index af607280f627..7c6861c35169 100644
--- a/dom/media/test/test_mediarecorder_record_gum_video_timeslice_mixed.html
+++ b/dom/media/test/test_mediarecorder_record_gum_video_timeslice_mixed.html
@@ -13,7 +13,7 @@ function unexpected({type}) {
   ok(false, `${type} unexpectedly fired`);
 }
 
-(async () => {
+(async _ => {
   SimpleTest.waitForExplicitFinish();
   let blobUrl = null;
   let stream = null;
@@ -32,7 +32,7 @@ function unexpected({type}) {
       {audio: true, video: true});
     const blobs = [];
 
-    let mediaRecorder = new MediaRecorder(stream);
+    mediaRecorder = new MediaRecorder(stream);
     is(mediaRecorder.stream, stream,
        "Media recorder stream = element stream at the start of recording");
     mediaRecorder.start();
@@ -78,7 +78,7 @@ function unexpected({type}) {
 
     await Promise.race([
       new Promise(res => video.onended = res),
-      new Promise((res, rej) => video.onerror = () => rej(video.error.message)),
+      new Promise((_, rej) => video.onerror = _ => rej(video.error.message)),
     ]);
   } catch (e) {
     ok(false, e);
diff --git a/dom/media/test/test_mediarecorder_record_timeslice.html b/dom/media/test/test_mediarecorder_record_timeslice.html
index 3e547e77b418..faa6eb9deae7 100644
--- a/dom/media/test/test_mediarecorder_record_timeslice.html
+++ b/dom/media/test/test_mediarecorder_record_timeslice.html
@@ -68,7 +68,7 @@ function startTest(test, token) {
 
       // We'll stop recording upon the 1st blob being received
       if (dataAvailableCount === 1) {
-        mediaRecorder.onstop = function (event) {
+        mediaRecorder.onstop = function (evt) {
           info('onstop fired');
 
           if (!onDataAvailableFirst) {
diff --git a/dom/media/test/test_mediarecorder_record_upsize_resolution.html b/dom/media/test/test_mediarecorder_record_upsize_resolution.html
index 071925467cb4..d02fd08e444d 100644
--- a/dom/media/test/test_mediarecorder_record_upsize_resolution.html
+++ b/dom/media/test/test_mediarecorder_record_upsize_resolution.html
@@ -11,7 +11,6 @@
 <div id="content">
 </div>
 <script class="testbody" type="text/javascript">
-/* import-globals-from ../../canvas/test/captureStream_common.js */
 
 function startTest() {
   var canvas = document.createElement("canvas");
diff --git a/dom/media/test/test_mediarecorder_reload_crash.html b/dom/media/test/test_mediarecorder_reload_crash.html
index f6d008261f01..134d28a7eca5 100644
--- a/dom/media/test/test_mediarecorder_reload_crash.html
+++ b/dom/media/test/test_mediarecorder_reload_crash.html
@@ -11,15 +11,13 @@
 a Bug 894348</a>
 <pre id="test">
 <script class="testbody" type="text/javascript">
-  for (let i = 0; i< 5; i++) {
-    /* eslint-disable no-undef */
+  for (i = 0; i< 5; i++) {
     try { o0 = document.createElement('audio') } catch(e) { }
     try { o0.src = "sound.ogg" } catch(e) { }
     try { (document.body || document.documentElement).appendChild(o0) } catch(e) { }
     try { o1 = o0.mozCaptureStreamUntilEnded(); } catch(e) { }
     try { o2 = new MediaRecorder(o1) } catch(e) { }
     try { o2.start(0) } catch(e) { }
-    /* eslint-enable no-undef */
     SpecialPowers.gc();
   }
   ok(true, "pass the crash test");
diff --git a/dom/media/test/test_mediarecorder_state_transition.html b/dom/media/test/test_mediarecorder_state_transition.html
index 5d6483b7de0e..2af0b36ae301 100644
--- a/dom/media/test/test_mediarecorder_state_transition.html
+++ b/dom/media/test/test_mediarecorder_state_transition.html
@@ -223,12 +223,12 @@ var operationTests = [
  *                                 operation tests
  */
 function runStateTransitionTests(testStream) {
-  for (const operationTest of operationTests) {
+  for (operationTest of operationTests) {
     var mediaRecorder = new MediaRecorder(testStream);
     var operationsString = operationTest.operations.toString();
 
     try {
-      for (const operation of operationTest.operations) {
+      for (operation of operationTest.operations) {
         if (operationTest.timeSlice && operation === 'start') {
           operationsString += ' with timeslice ' + operationTest.timeSlice;
           mediaRecorder[operation](operationTest.timeSlice);
@@ -256,6 +256,7 @@ function runStateTransitionTests(testStream) {
  */
 function startTest(test, token) {
   var element = document.createElement('audio');
+  var expectedMimeType = test.type.substring(0, test.type.indexOf(';'));
 
   element.token = token;
   manager.started(token);
diff --git a/dom/media/test/test_mediatrack_consuming_mediastream.html b/dom/media/test/test_mediatrack_consuming_mediastream.html
index b930ca4fdc8d..1f3ed0091086 100644
--- a/dom/media/test/test_mediatrack_consuming_mediastream.html
+++ b/dom/media/test/test_mediatrack_consuming_mediastream.html
@@ -14,8 +14,10 @@ async function startTest() {
   let steps = 0;
   let audioOnchange = 0;
   let audioOnaddtrack = 0;
+  let audioOnremovetrack = 0;
   let videoOnchange = 0;
   let videoOnaddtrack = 0;
+  let videoOnremovetrack = 0;
   let isPlaying = false;
   let element = document.createElement("video");
   let stream;
@@ -32,6 +34,10 @@ async function startTest() {
     audioOnaddtrack++;
   };
 
+  element.audioTracks.onremovetrack = function(e) {
+    audioOnremovetrack++;
+  };
+
   element.audioTracks.onchange = function(e) {
     audioOnchange++;
   };
@@ -40,6 +46,10 @@ async function startTest() {
     videoOnaddtrack++;
   };
 
+  element.videoTracks.onremovetrack = function(e) {
+    videoOnremovetrack++;
+  };
+
   element.videoTracks.onchange = function(e) {
     videoOnchange++;
   };
diff --git a/dom/media/test/test_mediatrack_replay_from_end.html b/dom/media/test/test_mediatrack_replay_from_end.html
index bd1e2b23c4a0..7c50e7d6849b 100644
--- a/dom/media/test/test_mediatrack_replay_from_end.html
+++ b/dom/media/test/test_mediatrack_replay_from_end.html
@@ -26,8 +26,10 @@ function startTest(test, token) {
   var elemType = getMajorMimeType(test.type);
   var element = document.createElement(elemType);
 
+  var audioOnchange = 0;
   var audioOnaddtrack = 0;
   var audioOnremovetrack = 0;
+  var videoOnchange = 0;
   var videoOnaddtrack = 0;
   var videoOnremovetrack = 0;
   var isPlaying = false;
diff --git a/dom/media/test/test_metadata.html b/dom/media/test/test_metadata.html
index 08f28f5f47e7..e088aa1b8c68 100644
--- a/dom/media/test/test_metadata.html
+++ b/dom/media/test/test_metadata.html
@@ -26,7 +26,7 @@ function startTest(test, token) {
   // Tags should not be available immediately.
   var exception_fired = false;
   try {
-    a.mozGetMetadata();
+    var m = a.mozGetMetadata();
   } catch (e) {
     is(e.name, 'InvalidStateError',
        "early mozGetMetadata() should throw InvalidStateError");
@@ -38,7 +38,7 @@ function startTest(test, token) {
   // Wait until metadata has loaded.
   a.addEventListener('loadedmetadata', function() {
     // read decoded tags
-    let tags = a.mozGetMetadata();
+    tags = a.mozGetMetadata();
     ok(tags, "mozGetMetadata() should return a truthy value");
     // Dump them out.
     var d = document.getElementById('output');
@@ -47,7 +47,7 @@ function startTest(test, token) {
     html += ' on '+test.name+'</p></caption>\n';
     html += '<tr><th>tag</th>';
     html += '<th>decoded value</th><th>expected value</th></tr>\n';
-    for (let tag in tags) {
+    for (tag in tags) {
       html += '<tr><td>'+tag+'</td>';
       html += '<td>'+tags[tag]+'</td>';
       html += '<td>'+test.tags[tag]+'</td>';
@@ -58,15 +58,14 @@ function startTest(test, token) {
     }
     html += '</table>\n';
     var div = document.createElement('div');
-    // eslint-disable-next-line no-unsanitized/property
     div.innerHTML = html;
     d.appendChild(div);
     // Verify decoded tag values.
-    for (let tag in tags) {
+    for (tag in tags) {
       is(tags[tag], test.tags[tag], "Tag '"+tag+"' should match");
     }
     // Verify expected tag values
-    for (let tag in test.tags) {
+    for (tag in test.tags) {
       is(tags[tag], test.tags[tag], "Tag '"+tag+"' should match");
     }
     removeNodeAndSource(a);
diff --git a/dom/media/test/test_midflight_redirect_blocked.html b/dom/media/test/test_midflight_redirect_blocked.html
index 55b96ccd381f..21e7a5813cff 100644
--- a/dom/media/test/test_midflight_redirect_blocked.html
+++ b/dom/media/test/test_midflight_redirect_blocked.html
@@ -34,13 +34,14 @@
           element.addEventListener("loadedmetadata", ()=>{
             resolve(true);
             removeNodeAndSource(element);
-          });
+          }, false);
 
           element.addEventListener("error", ()=>{
             resolve(false);
             removeNodeAndSource(element);
-          });
+          }, false);
 
+          var noise = Math.floor(Math.random() * 100000000);
           // Note: request redirect before the end of metadata, otherwise we won't
           // error before metadata has loaded if mixed origins are allowed.
           element.src = "midflight-redirect.sjs?resource=" + test.name
@@ -56,11 +57,14 @@
       let v = document.createElement("video");
       const testCases = gSmallTests.filter(t => v.canPlayType(t.type));
 
-      async function testMediaLoad(expectedToLoad, message, useCors) {
-        for (let test of testCases) {
-          let loaded = await testIfLoadsToMetadata(test, useCors);
-          is(loaded, expectedToLoad, test.name + " " + message);
-        }
+      function testMediaLoad(expectedToLoad, message, useCors) {
+        return new Promise(async function(resolve, reject) {
+          for (let test of testCases) {
+            let loaded = await testIfLoadsToMetadata(test, useCors);
+            is(loaded, expectedToLoad, test.name + " " + message);
+          }
+          resolve();
+        });
       }
 
       async function runTest() {
diff --git a/dom/media/test/test_play_twice.html b/dom/media/test/test_play_twice.html
index e94f28a03135..9c1851a492a0 100644
--- a/dom/media/test/test_play_twice.html
+++ b/dom/media/test/test_play_twice.html
@@ -13,21 +13,21 @@
 var manager = new MediaTestManager;
 
 function startTest(test, token) {
-  var video = document.createElement('video');
-  video.token = token;
+  var v = document.createElement('video');
+  v.token = token;
   manager.started(token);
-  video.src = test.name;
-  video.name = test.name;
-  video.playingCount = 0;
-  video._playedOnce = false;
+  v.src = test.name;
+  v.name = test.name;
+  v.playingCount = 0;
+  v._playedOnce = false;
 
-  var check = function(t, v) { return function() {
-    checkMetadata(t.name, v, test);
-  }}(test, video);
+  var check = function(test, v) { return function() {
+    checkMetadata(test.name, v, test);
+  }}(test, v);
 
-  var noLoad = function(t, v) { return function() {
-    ok(false, t.name + " should not fire 'load' event");
-  }}(test, video);
+  var noLoad = function(test, v) { return function() {
+    ok(false, test.name + " should not fire 'load' event");
+  }}(test, v);
 
   function finish(v) {
     removeNodeAndSource(v);
@@ -40,14 +40,14 @@ function startTest(test, token) {
     }
   }
 
-  var checkEnded = function(t, v) { return function() {
-    if (t.duration) {
-      ok(Math.abs(v.currentTime - t.duration) < 0.1,
-         t.name + " current time at end: " + v.currentTime);
+  var checkEnded = function(test, v) { return function() {
+    if (test.duration) {
+      ok(Math.abs(v.currentTime - test.duration) < 0.1,
+         test.name + " current time at end: " + v.currentTime);
     }
 
-    is(v.readyState, v.HAVE_CURRENT_DATA, t.name + " checking readyState");
-    ok(v.ended, t.name + " checking playback has ended");
+    is(v.readyState, v.HAVE_CURRENT_DATA, test.name + " checking readyState");
+    ok(v.ended, test.name + " checking playback has ended");
     ok(v.playingCount > 0, "Expect at least one playing event");
     v.playingCount = 0;
 
@@ -58,33 +58,33 @@ function startTest(test, token) {
       v._playedOnce = true;
       v.play();
     }
-  }}(test, video);
+  }}(test, v);
 
-  var checkSuspended = function(t, v) { return function() {
+  var checkSuspended = function(test, v) { return function() {
     if (v.seenSuspend) {
       return;
     }
 
     v.seenSuspend = true;
-    ok(true, t.name + " got suspend");
+    ok(true, test.name + " got suspend");
     mayFinish(v);
-  }}(test, video);
+  }}(test, v);
 
-  var checkPlaying = function(t, v) { return function() {
-    is(t.name, v.name, "Should be testing file we think we're testing...");
+  var checkPlaying = function(test, v) { return function() {
+    is(test.name, v.name, "Should be testing file we think we're testing...");
     v.playingCount++;
-  }}(test, video);
+  }}(test, v);
 
-  video.addEventListener("load", noLoad);
-  video.addEventListener("loadedmetadata", check);
-  video.addEventListener("playing", checkPlaying);
+  v.addEventListener("load", noLoad);
+  v.addEventListener("loadedmetadata", check);
+  v.addEventListener("playing", checkPlaying);
 
   // We should get "ended" and "suspend" events for every resource
-  video.addEventListener("ended", checkEnded);
-  video.addEventListener("suspend", checkSuspended);
+  v.addEventListener("ended", checkEnded);
+  v.addEventListener("suspend", checkSuspended);
 
-  document.body.appendChild(video);
-  video.play();
+  document.body.appendChild(v);
+  v.play();
 }
 
 manager.runTests(gReplayTests, startTest);
diff --git a/dom/media/test/test_playback.html b/dom/media/test/test_playback.html
index 5e28861e9334..d82e4f074926 100644
--- a/dom/media/test/test_playback.html
+++ b/dom/media/test/test_playback.html
@@ -13,91 +13,91 @@
 var manager = new MediaTestManager;
 
 function startTest(test, token) {
-  var video = document.createElement('video');
-  video.preload = "metadata";
-  video.token = token;
-  video.prevTime = 0;
-  video.seenEnded = false;
-  video.seenSuspend = false;
+  var v = document.createElement('video');
+  v.preload = "metadata";
+  v.token = token;
+  v.prevTime = 0;
+  v.seenEnded = false;
+  v.seenSuspend = false;
 
   var handler = {
     "ontimeout": function() {
-      Log(token, "timed out: ended=" + video.seenEnded + ", suspend=" + video.seenSuspend);
+      Log(token, "timed out: ended=" + v.seenEnded + ", suspend=" + v.seenSuspend);
     }
   };
   manager.started(token, handler);
 
-  video.src = test.name;
-  video.name = test.name;
+  v.src = test.name;
+  v.name = test.name;
 
-  var check = function(t, v) { return function() {
-    is(t.name, v.name, t.name + ": Name should match #1");
-    checkMetadata(t.name, v, t);
-  }}(test, video);
+  var check = function(test, v) { return function() {
+    is(test.name, v.name, test.name + ": Name should match #1");
+    checkMetadata(test.name, v, test);
+  }}(test, v);
 
-  var noLoad = function(t, v) { return function() {
-    ok(false, t.name + " should not fire 'load' event");
-  }}(test, video);
+  var noLoad = function(test, v) { return function() {
+    ok(false, test.name + " should not fire 'load' event");
+  }}(test, v);
 
-  var noError = function(t, v) { return function() {
-    ok(false, t.name + " should not fire 'error' event " + v.error.message);
-  }}(test, video);
+  var noError = function(test, v) { return function() {
+    ok(false, test.name + " should not fire 'error' event " + v.error.message);
+  }}(test, v);
 
   var finish = function() {
-    video.finished = true;
-    video.removeEventListener("timeupdate", timeUpdate);
-    removeNodeAndSource(video);
-    manager.finished(video.token);
+    v.finished = true;
+    v.removeEventListener("timeupdate", timeUpdate);
+    removeNodeAndSource(v);
+    manager.finished(v.token);
   }
 
   // We should get "ended" and "suspend" events to finish the test.
   var mayFinish = function() {
-    if (video.seenEnded && video.seenSuspend) {
+    if (v.seenEnded && v.seenSuspend) {
       finish();
     }
   }
 
-  var checkEnded = function(t, v) { return function() {
-    is(t.name, v.name, t.name + ": Name should match #2");
-    checkMetadata(t.name, v, test);
-    is(v.readyState, v.HAVE_CURRENT_DATA, t.name + " checking readyState");
-    ok(v.ended, t.name + " checking playback has ended");
-    ok(!v.finished, t.name + " shouldn't be finished");
-    ok(!v.seenEnded, t.name + " shouldn't be ended");
+  var checkEnded = function(test, v) { return function() {
+    is(test.name, v.name, test.name + ": Name should match #2");
+    checkMetadata(test.name, v, test);
+    is(v.readyState, v.HAVE_CURRENT_DATA, test.name + " checking readyState");
+    ok(v.ended, test.name + " checking playback has ended");
+    ok(!v.finished, test.name + " shouldn't be finished");
+    ok(!v.seenEnded, test.name + " shouldn't be ended");
 
     v.seenEnded = true;
     mayFinish();
-  }}(test, video);
+  }}(test, v);
 
-  var checkSuspended = function(t, v) { return function() {
+  var checkSuspended = function(test, v) { return function() {
     if (v.seenSuspend) {
       return;
     }
-    is(t.name, v.name, t.name + ": Name should match #3");
+    is(test.name, v.name, test.name + ": Name should match #3");
 
     v.seenSuspend = true;
     mayFinish();
-  }}(test, video);
+  }}(test, v);
 
-  var timeUpdate = function(t, v) { return function() {
+  var timeUpdate = function(test, v) { return function() {
     if (v.prevTime > v.currentTime) {
-      ok(false, t.name + " time should run forwards: p=" +
+      ok(false, test.name + " time should run forwards: p=" +
                 v.prevTime + " c=" + v.currentTime);
     }
     v.prevTime = v.currentTime;
-  }}(test, video);
+  }}(test, v);
 
-  video.addEventListener("load", noLoad);
-  video.addEventListener("error", noError);
-  video.addEventListener("loadedmetadata", check);
-  video.addEventListener("timeupdate", timeUpdate);
+  v.addEventListener("load", noLoad);
+  v.addEventListener("error", noError);
+  v.addEventListener("loadedmetadata", check);
+  v.addEventListener("timeupdate", timeUpdate);
 
   // We should get "ended" and "suspend" events for every resource
-  video.addEventListener("ended", checkEnded);
-  video.addEventListener("suspend", checkSuspended);
+  v.addEventListener("ended", checkEnded);
+  v.addEventListener("suspend", checkSuspended);
 
-  document.body.appendChild(video);
-  video.play();
+  document.body.appendChild(v);
+  v.play();
 }
 
 manager.runTests(gPlayTests, startTest);
diff --git a/dom/media/test/test_playback_errors.html b/dom/media/test/test_playback_errors.html
index 7b3f046099b2..ce8340f9484e 100644
--- a/dom/media/test/test_playback_errors.html
+++ b/dom/media/test/test_playback_errors.html
@@ -13,10 +13,10 @@
 var manager = new MediaTestManager;
 
 function startTest(test, token) {
-  var video = document.createElement('video');
+  var v = document.createElement('video');
   manager.started(token);
-  video._errorCount = 0;
-  video._ignore = false;
+  v._errorCount = 0;
+  v._ignore = false;
   function endedTest(v) {
     if (v._ignore)
       return;
@@ -24,20 +24,20 @@ function startTest(test, token) {
     v.remove();
     manager.finished(token);
   }
-  var checkError = function(t, v) { return function(evt) {
+  var checkError = function(test, v) { return function(evt) {
     v._errorCount++;
-    is(v._errorCount, 1, t.name + " only one error fired");
+    is(v._errorCount, 1, test.name + " only one error fired");
     endedTest(v);
-  }}(test, video);
-  var checkEnded = function(t, v) { return function() {
-    ok(false, t.name + " successfully played");
+  }}(test, v);
+  var checkEnded = function(test, v) { return function() {
+    ok(false, test.name + " successfully played");
     endedTest(v);
-  }}(test, video);
-  video.addEventListener("error", checkError);
-  video.addEventListener("ended", checkEnded);
-  video.src = test.name;
-  document.body.appendChild(video);
-  video.play();
+  }}(test, v);
+  v.addEventListener("error", checkError);
+  v.addEventListener("ended", checkEnded);
+  v.src = test.name;
+  document.body.appendChild(v);
+  v.play();
 }
 
 manager.runTests(gErrorTests, startTest);
diff --git a/dom/media/test/test_playback_hls.html b/dom/media/test/test_playback_hls.html
index 7d5c777fc130..553c8d253eba 100644
--- a/dom/media/test/test_playback_hls.html
+++ b/dom/media/test/test_playback_hls.html
@@ -13,74 +13,74 @@
 var manager = new MediaTestManager;
 
 function startTest(test, token) {
-  var video = document.createElement('video');
-  video.preload = "metadata";
-  video.token = token;
-  video.prevTime = 0;
-  video.seenEnded = false;
+  var v = document.createElement('video');
+  v.preload = "metadata";
+  v.token = token;
+  v.prevTime = 0;
+  v.seenEnded = false;
 
   var handler = {
     "ontimeout": function() {
-      Log(token, "timed out: ended=" + video.seenEnded);
+      Log(token, "timed out: ended=" + v.seenEnded);
     }
   };
   manager.started(token, handler);
 
-  video.src = test.name;
-  video.name = test.name;
+  v.src = test.name;
+  v.name = test.name;
 
-  var check = function(t, v) { return function() {
-    is(t.name, v.name, t.name + ": Name should match #1");
-    checkMetadata(t.name, v, t);
-  }}(test, video);
+  var check = function(test, v) { return function() {
+    is(test.name, v.name, test.name + ": Name should match #1");
+    checkMetadata(test.name, v, test);
+  }}(test, v);
 
-  var noLoad = function(t, v) { return function() {
-    ok(false, t.name + " should not fire 'load' event");
-  }}(test, video);
+  var noLoad = function(test, v) { return function() {
+    ok(false, test.name + " should not fire 'load' event");
+  }}(test, v);
 
   var finish = function() {
-    video.finished = true;
-    video.removeEventListener("timeupdate", timeUpdate);
-    removeNodeAndSource(video);
-    manager.finished(video.token);
+    v.finished = true;
+    v.removeEventListener("timeupdate", timeUpdate);
+    removeNodeAndSource(v);
+    manager.finished(v.token);
   }
 
   // We should get "ended" events to finish the test.
   var mayFinish = function() {
-    if (video.seenEnded) {
+    if (v.seenEnded) {
       finish();
     }
   }
 
-  var checkEnded = function(t, v) { return function() {
-    is(t.name, v.name, t.name + ": Name should match #2");
-    checkMetadata(t.name, v, test);
-    is(v.readyState, v.HAVE_CURRENT_DATA, t.name + " checking readyState");
-    ok(v.ended, t.name + " checking playback has ended");
-    ok(!v.finished, t.name + " shouldn't be finished");
-    ok(!v.seenEnded, t.name + " shouldn't be ended");
+  var checkEnded = function(test, v) { return function() {
+    is(test.name, v.name, test.name + ": Name should match #2");
+    checkMetadata(test.name, v, test);
+    is(v.readyState, v.HAVE_CURRENT_DATA, test.name + " checking readyState");
+    ok(v.ended, test.name + " checking playback has ended");
+    ok(!v.finished, test.name + " shouldn't be finished");
+    ok(!v.seenEnded, test.name + " shouldn't be ended");
 
     v.seenEnded = true;
     mayFinish();
-  }}(test, video);
+  }}(test, v);
 
-  var timeUpdate = function(t, v) { return function() {
+  var timeUpdate = function(test, v) { return function() {
     if (v.prevTime > v.currentTime) {
-      ok(false, t.name + " time should run forwards: p=" +
+      ok(false, test.name + " time should run forwards: p=" +
                 v.prevTime + " c=" + v.currentTime);
     }
     v.prevTime = v.currentTime;
-  }}(test, video);
+  }}(test, v);
 
-  video.addEventListener("load", noLoad);
-  video.addEventListener("loadedmetadata", check);
-  video.addEventListener("timeupdate", timeUpdate);
+  v.addEventListener("load", noLoad);
+  v.addEventListener("loadedmetadata", check);
+  v.addEventListener("timeupdate", timeUpdate);
 
   // We should get "ended" events for the hls resource
-  video.addEventListener("ended", checkEnded);
+  v.addEventListener("ended", checkEnded);
 
-  document.body.appendChild(video);
-  video.play();
+  document.body.appendChild(v);
+  v.play();
 }
 
 manager.runTests(gHLSTests, startTest);
diff --git a/dom/media/test/test_playback_reactivate.html b/dom/media/test/test_playback_reactivate.html
index dec5330ce5a8..cfbc6f493251 100644
--- a/dom/media/test/test_playback_reactivate.html
+++ b/dom/media/test/test_playback_reactivate.html
@@ -20,22 +20,22 @@
 var manager = new MediaTestManager;
 
 function startTest(test, token) {
-  var video = document.createElement('video');
-  video.preload = "metadata";
-  video.token = token;
+  var v = document.createElement('video');
+  v.preload = "metadata";
+  v.token = token;
 
   var handler = {
     "ontimeout": function() {
-      Log(token, "timed out: ended=" + video.seenEnded + ", suspend=" + video.seenSuspend);
+      Log(token, "timed out: ended=" + v.seenEnded + ", suspend=" + v.seenSuspend);
     }
   };
   manager.started(token, handler);
 
-  video.src = test.name;
-  video.name = test.name;
+  v.src = test.name;
+  v.name = test.name;
 
-  var check = function(t, v) { return function() {
-    is(t.name, v.name, t.name + ": Name should match #1");
+  var check = function(test, v) { return function() {
+    is(test.name, v.name, test.name + ": Name should match #1");
     Log(v.token, "removeChild: " + v.name);
     document.body.removeChild(v);
     var appendAndPlayElement = function() {
@@ -45,28 +45,28 @@ function startTest(test, token) {
       v.play();
     }
     setTimeout(appendAndPlayElement, 2000);
-  }}(test, video);
+  }}(test, v);
 
   var finish = function() {
-    video.finished = true;
-    removeNodeAndSource(video);
-    manager.finished(video.token);
+    v.finished = true;
+    removeNodeAndSource(v);
+    manager.finished(v.token);
   }
 
-  var checkEnded = function(t, v) { return function() {
-    is(t.name, v.name, t.name + ": Name should match #2");
-    checkMetadata(t.name, v, t);
-    is(v.readyState, v.HAVE_CURRENT_DATA, t.name + " checking readyState");
-    ok(v.ended, t.name + " checking playback has ended");
+  var checkEnded = function(test, v) { return function() {
+    is(test.name, v.name, test.name + ": Name should match #2");
+    checkMetadata(test.name, v, test);
+    is(v.readyState, v.HAVE_CURRENT_DATA, test.name + " checking readyState");
+    ok(v.ended, test.name + " checking playback has ended");
 
     finish();
-  }}(test, video);
+  }}(test, v);
 
 
-  video.addEventListener("loadedmetadata", check);
-  video.addEventListener("ended", checkEnded);
+  v.addEventListener("loadedmetadata", check);
+  v.addEventListener("ended", checkEnded);
 
-  document.body.appendChild(video);
+  document.body.appendChild(v);
 }
 
 manager.runTests(gSmallTests, startTest);
diff --git a/dom/media/test/test_played.html b/dom/media/test/test_played.html
index e8b4906c2cf3..f2b4a7a202e1 100644
--- a/dom/media/test/test_played.html
+++ b/dom/media/test/test_played.html
@@ -32,7 +32,7 @@ function check_full_file_played(element) {
 var tests = [
 // Without playing, check that player.played.length == 0.
 {
-  setup(element) {
+  setup : function(element) {
     element.addEventListener("loadedmetadata", function() {
       is(element.played.length, 0, element.token + ": initial played.length equals zero");
       finish_test(element);
@@ -42,7 +42,7 @@ var tests = [
 },
 // Play the file, test the range we have.
 {
-  setup(element) {
+  setup : function(element) {
     check_full_file_played(element);
     element.play();
   },
@@ -52,7 +52,7 @@ var tests = [
 // Play the second half of the file, pause, play
 // an check we have only one range.
 {
-  setup (element) {
+  setup : function (element) {
     element.onended = function (e) {
       var t = e.target;
       t.onended = null;
@@ -72,7 +72,7 @@ var tests = [
 // Play the first half of the file, seek back, while
 // continuing to play. We shall have only one range.
 {
-  setup (element) {
+  setup : function (element) {
     let onTimeUpdate = function() {
       if (element.currentTime > element.duration / 2) {
         info(element.token + ": currentTime=" + element.currentTime + ", duration=" + element.duration);
@@ -95,7 +95,7 @@ var tests = [
 // Play and seek to have two ranges, and check that, as well a
 // boundaries.
 {
-  setup (element) {
+  setup : function (element) {
     let seekTarget = 0;
     let onTimeUpdate = function() {
       if (element.currentTime > element.duration / 2) {
@@ -132,7 +132,7 @@ var tests = [
 
 // Play to create two ranges, in the reverse order. check that they are sorted.
 {
-  setup (element) {
+  setup : function (element) {
     function end() {
       element.pause();
       let p = element.played;
@@ -178,7 +178,7 @@ var tests = [
 },
 // Seek repeatedly without playing. No range should appear.
 {
-  setup(element) {
+  setup : function(element) {
     let index = 1;
 
     element.addEventListener('seeked', function() {
@@ -202,7 +202,7 @@ function createTestArray() {
   var A = [];
   for (var i=0; i<tests.length; i++) {
     for (var k=0; k<gPlayedTests.length; k++) {
-      var t = {};
+      var t = new Object();
       t.setup = tests[i].setup;
       t.name = tests[i].name + "-" + gPlayedTests[k].name;
       t.type = gPlayedTests[k].type;
diff --git a/dom/media/test/test_preload_actions.html b/dom/media/test/test_preload_actions.html
index a9de54988c7f..a087bcd0b951 100644
--- a/dom/media/test/test_preload_actions.html
+++ b/dom/media/test/test_preload_actions.html
@@ -13,7 +13,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=548523
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=548523">Mozilla Bug 548523</a>
 <p id="display"></p>
 <div id="content" style="display: none">
-
+  
 </div>
 <!-- <button onClick="SimpleTest.finish();">Finish</button> -->
 <div>Tests complete: <span id="log" style="font-size: small;"></span></div>
@@ -41,7 +41,6 @@ addLoadEvent(function() {gotLoadEvent=true;});
 
 function log(m) {
   var l = document.getElementById("log");
-  // eslint-disable-next-line no-unsanitized/property
   l.innerHTML += m;
 }
 
@@ -66,7 +65,8 @@ var tests = [
     // after receiving a suspend event. Should not receive loaded events until after we call load().
     // Note the suspend event is explictly sent by our "stop the load" code, but other tests can't rely
     // on it for the preload:metadata case, as there can be multiple suspend events when loading metadata.
-    suspend(e) {
+    suspend:
+    function(e) {
       var v = e.target;
       is(v._gotLoadStart, true, "(1) Must get loadstart.");
       is(v._gotLoadedMetaData, false, "(1) Must not get loadedmetadata.");
@@ -76,7 +76,8 @@ var tests = [
       maybeFinish(v, 1);
     },
 
-    setup(v) {
+    setup:
+    function(v) {
       v._gotLoadStart = false;
       v._gotLoadedMetaData = false;
       v.preload = "none";
@@ -92,7 +93,8 @@ var tests = [
   {
     // 2. Add preload:metadata video with src to document. Should halt with NETWORK_IDLE, HAVE_CURRENT_DATA
     // after suspend event and after loadedmetadata.
-    loadeddata(e) {
+    loadeddata:
+    function(e) {
       var v = e.target;
       is(v._gotLoadStart, true, "(2) Must get loadstart.");
       is(v._gotLoadedMetaData, true, "(2) Must get loadedmetadata.");
@@ -102,7 +104,8 @@ var tests = [
       maybeFinish(v, 2);
     },
 
-    setup(v) {
+    setup:
+    function(v) {
       v._gotLoadStart = false;
       v._gotLoadedMetaData = false;
       v.preload = "metadata";
@@ -118,14 +121,16 @@ var tests = [
   },
   {
     // 3. Add preload:auto to document. Should receive canplaythrough eventually.
-    canplaythrough(e) {
+    canplaythrough:
+    function(e) {
       var v = e.target;
       is(v._gotLoadStart, true, "(3) Must get loadstart.");
       is(v._gotLoadedMetaData, true, "(3) Must get loadedmetadata.");
       maybeFinish(v, 3);
     },
 
-    setup(v) {
+    setup:
+    function(v) {
       v._gotLoadStart = false;
       v._gotLoadedMetaData = false;
       v.preload = "auto";
@@ -140,7 +145,8 @@ var tests = [
   },
   {
     // 4. Add preload:none video to document. Call play(), should load then play through.
-    suspend(e) {
+    suspend:
+    function(e) {
       var v = e.target;
       if (v._gotSuspend) {
         return; // We can receive multiple suspend events, like the one after download completes.
@@ -154,12 +160,14 @@ var tests = [
       v.play(); // Should load and play through.
     },
 
-    ended(e) {
+    ended:
+    function(e) {
       ok(true, "(4) Got playback ended");
       maybeFinish(e.target, 4);
     },
 
-    setup(v) {
+    setup:
+    function(v) {
       v._gotLoadStart = false;
       v._gotLoadedMetaData = false;
       v._gotSuspend = false;
@@ -177,7 +185,8 @@ var tests = [
   {
     // 5. preload:none video without resource, add to document, will implicitly start a
     // preload:none load. Add a src, it shouldn't load.
-    suspend(e) {
+    suspend:
+    function(e) {
       var v = e.target;
       is(v._gotLoadStart, true, "(5) Must get loadstart.");
       is(v._gotLoadedMetaData, false, "(5) Must not get loadedmetadata.");
@@ -187,7 +196,8 @@ var tests = [
       maybeFinish(v, 5);
     },
 
-    setup(v) {
+    setup:
+    function(v) {
       v._gotLoadStart = false;
       v._gotLoadedMetaData = false;
       v.preload = "none";
@@ -203,7 +213,8 @@ var tests = [
   {
     // 6. preload:none video without resource, add to document, will implicitly start a
     // preload:none load. Add a source, it shouldn't load.
-    suspend(e) {
+    suspend:
+    function(e) {
       var v = e.target;
       is(v._gotLoadStart, true, "(6) Must get loadstart.");
       is(v._gotLoadedMetaData, false, "(6) Must not get loadedmetadata.");
@@ -213,7 +224,8 @@ var tests = [
       maybeFinish(v, 6);
     },
 
-    setup(v) {
+    setup:
+    function(v) {
       v._gotLoadStart = false;
       v._gotLoadedMetaData = false;
       v.preload = "none";
@@ -232,9 +244,10 @@ var tests = [
   {
     // 7. create a preload:none document with multiple sources, the first of which is invalid.
     // Add to document, then play. It should load and play through the second source.
-    suspend(e) {
+    suspend:
+    function(e) {
       var v = e.target;
-      if (v._gotSuspend)
+      if (v._gotSuspend) 
         return; // We can receive multiple suspend events, like the one after download completes.
       v._gotSuspend = true;
       is(v._gotLoadStart, true, "(7) Must get loadstart.");
@@ -245,14 +258,16 @@ var tests = [
       v.play(); // Should load and play through.
     },
 
-    ended(e) {
+    ended:
+    function(e) {
       ok(true, "(7) Got playback ended");
       var v = e.target;
-      is(v._gotErrorEvent, true, "(7) Should get error event from first source load failure");
+      is(v._gotErrorEvent, true, "(7) Should get error event from first source load failure");      
       maybeFinish(v, 7);
     },
 
-    setup(v) {
+    setup:
+    function(v) {
       v._gotLoadStart = false;
       v._gotLoadedMetaData = false;
       v.preload = "none";
@@ -277,7 +292,8 @@ var tests = [
   },
   {
     // 8. Change preload value from none to metadata should cause metadata to be loaded.
-    loadeddata(e) {
+    loadeddata:
+    function(e) {
       var v = e.target;
       is(v._gotLoadedMetaData, true, "(8) Must get loadedmetadata.");
       ok(v.readyState >= v.HAVE_CURRENT_DATA, "(8) ReadyState must be >= HAVE_CURRENT_DATA on suspend.");
@@ -286,7 +302,8 @@ var tests = [
       maybeFinish(v, 8);
     },
 
-    setup(v) {
+    setup:
+    function(v) {
       v._gotLoadedMetaData = false;
       v.preload = "none";
       v.addEventListener("loadstart", function(e){v.preload = "metadata";});
@@ -325,13 +342,15 @@ var tests = [
   },*/
   {
     // 10. Change preload value from none to auto should cause entire media to be loaded.
-    canplaythrough(e) {
+    canplaythrough:
+    function(e) {
       var v = e.target;
       is(v._gotLoadedMetaData, true, "(10) Must get loadedmetadata.");
       maybeFinish(v, 10);
     },
 
-    setup(v) {
+    setup:
+    function(v) {
       v._gotLoadedMetaData = false;
       v.preload = "none";
       v.addEventListener("loadstart", function(e){v.preload = "auto";});
@@ -345,7 +364,8 @@ var tests = [
   },
   {
     // 11. Change preload value from none to metadata should cause metadata to load.
-    loadeddata(e) {
+    loadeddata:
+    function(e) {
       var v = e.target;
       is(v._gotLoadedMetaData, true, "(11) Must get loadedmetadata.");
       ok(v.readyState >= v.HAVE_CURRENT_DATA, "(11) ReadyState must be >= HAVE_CURRENT_DATA.");
@@ -354,7 +374,8 @@ var tests = [
       maybeFinish(v, 11);
     },
 
-    setup(v) {
+    setup:
+    function(v) {
       v._gotLoadedMetaData = false;
       v.preload = "none";
       v.addEventListener("loadstart", function(e){v.preload = "metadata";});
@@ -369,7 +390,8 @@ var tests = [
   {
     // 13. Change preload value from auto to none after specifying a src
     // should load according to preload none, no buffering should have taken place
-    suspend(e) {
+    suspend:
+    function(e) {
       var v = e.target;
       is(v._gotLoadStart, true, "(13) Must get loadstart.");
       is(v._gotLoadedMetaData, false, "(13) Must not get loadedmetadata.");
@@ -379,7 +401,8 @@ var tests = [
       maybeFinish(v, 13);
     },
 
-    setup(v) {
+    setup:
+    function(v) {
       v._gotLoadStart = false;
       v._gotLoadedMetaData = false;
       v.preload = "auto";
@@ -389,14 +412,15 @@ var tests = [
       v.addEventListener("loadstart", function(e){v._gotLoadStart = true;});
       v.addEventListener("suspend", this.suspend);
       document.body.appendChild(v); // Causes implicit load, should load according to preload none
-      document.createElement("source");
+      var s = document.createElement("source");
     },
 
     name: "test13",
   },
   {
     // 14. Add preload:metadata video with src to document. Play(), should play through.
-    loadeddata(e) {
+    loadeddata:
+    function(e) {
       var v = e.target;
       is(v._gotLoadStart, true, "(14) Must get loadstart.");
       is(v._gotLoadedMetaData, true, "(14) Must get loadedmetadata.");
@@ -406,13 +430,15 @@ var tests = [
       v.play();
     },
 
-    ended(e) {
+    ended:
+    function(e) {
       ok(true, "(14) Got playback ended");
       var v = e.target;
       maybeFinish(v, 14);
     },
 
-    setup(v) {
+    setup:
+    function(v) {
       v._gotLoadStart = false;
       v._gotLoadedMetaData = false;
       v.preload = "metadata";
@@ -429,13 +455,15 @@ var tests = [
   },
   {
     // 15. Autoplay should override preload:none.
-    ended(e) {
+    ended:
+    function(e) {
       ok(true, "(15) Got playback ended.");
       var v = e.target;
       maybeFinish(v, 15);
     },
 
-    setup(v) {
+    setup:
+    function(v) {
       v._gotLoadStart = false;
       v._gotLoadedMetaData = false;
       v.preload = "none";
@@ -451,6 +479,7 @@ var tests = [
                     "loadeddata", "playing", "ended", "error", "stalled", "emptied", "abort",
                     "waiting", "pause"];
       function logEvent(e) {
+        var v = e.target;
         info(e.target.token + ": got " + e.type);
       }
       events.forEach(function(e) {
@@ -462,13 +491,15 @@ var tests = [
   },
   {
     // 16. Autoplay should override preload:metadata.
-    ended(e) {
+    ended:
+    function(e) {
       ok(true, "(16) Got playback ended.");
       var v = e.target;
       maybeFinish(v, 16);
     },
 
-    setup(v) {
+    setup:
+    function(v) {
       v.preload = "metadata";
       v.autoplay = true;
       v.addEventListener("ended", this.ended);
@@ -480,13 +511,15 @@ var tests = [
   },
   {
     // 17. On a preload:none video, adding autoplay should disable preload none, i.e. don't break autoplay!
-    ended(e) {
+    ended:
+    function(e) {
       ok(true, "(17) Got playback ended.");
       var v = e.target;
       maybeFinish(v, 17);
     },
 
-    setup(v) {
+    setup:
+    function(v) {
       v.addEventListener("ended", this.ended);
       v.preload = "none";
       document.body.appendChild(v); // Causes implicit load, which will be halted due to preload:none.
@@ -499,13 +532,15 @@ var tests = [
   {
     // 18. On a preload='none' video, call play() before load algorithms's sync
     // has run, the play() call should override preload='none'.
-    ended(e) {
+    ended:
+    function(e) {
       ok(true, "(18) Got playback ended.");
       var v = e.target;
       maybeFinish(v, 18);
     },
 
-    setup(v) {
+    setup:
+    function(v) {
       v.addEventListener("ended", this.ended);
       v.preload = "none";
       v.src = test.name; // Schedules async section to continue load algorithm.
@@ -518,7 +553,8 @@ var tests = [
   {
     // 19. Set preload='auto' on first video source then switching preload='none' and swapping the video source to another.
     // The second video should not start playing as it's preload state has been changed to 'none' from 'auto'
-    setup(v) {
+    setup:
+    function(v) {
       v.preload = "auto";
       v.src = test.name;
       // add a listener for when the video has loaded, so we know preload auto has worked
@@ -555,18 +591,18 @@ var tests = [
 ];
 
 var iterationCount = 0;
-function startTest(t, token) {
-  if (t == tests[0]) {
+function startTest(test, token) {
+  if (test == tests[0]) {
     ++iterationCount;
     info("iterationCount=" + iterationCount);
   }
   if (iterationCount == 2) {
     // Do this series of tests on logically different resources
-    t.name = baseName + "?" + Math.floor(Math.random()*100000);
+    test.name = baseName + "?" + Math.floor(Math.random()*100000);
   }
   var v = document.createElement("video");
   v.token = token;
-  t.setup(v);
+  test.setup(v);
   manager.started(token);
 }
 
diff --git a/dom/media/test/test_preload_suspend.html b/dom/media/test/test_preload_suspend.html
index 7f1146360f86..9e565f2ef4a3 100644
--- a/dom/media/test/test_preload_suspend.html
+++ b/dom/media/test/test_preload_suspend.html
@@ -29,7 +29,7 @@ var tests = [
     name: 'v1',
     preload: 'none',
     expectedSuspendCount: 2,
-    onsuspend(evt) {
+    onsuspend: function(evt) {
       checkSuspendCount(evt);
       if (evt.target.suspendCount == 1) {
         evt.target.preload = 'auto';
@@ -53,7 +53,7 @@ var tests = [
     name: 'v4',
     preload: 'none',
     expectedSuspendCount: 2,
-    onsuspend(evt) {
+    onsuspend: function(evt) {
       checkSuspendCount(evt);
       if (evt.target.suspendCount == 1) {
         evt.target.play();
@@ -76,7 +76,7 @@ var tests = [
     name: 'v6',
     preload: 'none',
     expectedSuspendCount: 2,
-    onsuspend(evt) {
+    onsuspend: function(evt) {
       checkSuspendCount(evt);
       if (evt.target.suspendCount == 1) {
         evt.target.autoplay = true;
diff --git a/dom/media/test/test_reset_events_async.html b/dom/media/test/test_reset_events_async.html
index 482ec55986ee..0d27b77ac02b 100644
--- a/dom/media/test/test_reset_events_async.html
+++ b/dom/media/test/test_reset_events_async.html
@@ -20,9 +20,9 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=975270
   a._abort = 0;
   a._emptied = 0;
   a.preload = "metadata"; // On B2G we default to preload:none.
-
+  
   is(a.networkState, HTMLMediaElement.NETWORK_EMPTY, "Shouldn't be loading");
-
+  
   a.addEventListener("abort", function(e) { a._abort++; });
   a.addEventListener("emptied", function(e) { a._emptied++; });
   a.addEventListener("loadedmetadata",
@@ -31,7 +31,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=975270
       is(a._emptied, 0, "Should not have received 'emptied' before 'loadedmetadata");
 
       a.addEventListener("loadstart",
-        function() {
+        function(e) {
           is(a._abort, 1, "Should have received 'abort' before 'loadstart");
           is(a._emptied, 1, "Should  have received 'emptied' before 'loadstart");
           SimpleTest.finish();
@@ -41,9 +41,9 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=975270
       is(a._abort, 0, "Should not have received 'abort' during setting a.src=''");
       is(a._emptied, 0, "Should not have received 'emptied' during setting a.src=''");
     });
-
+  
   a.src = getPlayableAudio(gSmallTests).name;
-
+    
   </script>
 </head>
 <body>
diff --git a/dom/media/test/test_reset_src.html b/dom/media/test/test_reset_src.html
index 1912369dac9a..4f68b24eb2bd 100644
--- a/dom/media/test/test_reset_src.html
+++ b/dom/media/test/test_reset_src.html
@@ -35,7 +35,7 @@ function onLoadedData_Audio(e) {
   var c = document.getElementsByTagName("canvas")[0].getContext("2d");
   try {
     c.drawImage(t, 0, 0, t.videoHeight, t.videoWidth);
-  } catch (ex) {
+  } catch (e) {
     ok(true, t.name + ": Trying to draw to a canvas should throw, since we don't have a frame anymore");
     finish(t);
     return;
@@ -56,7 +56,6 @@ function onTimeUpdate_Video(e) {
   ok(t.mozFrameDelay >= 0, t.name + ": mozFrameDelay should be positive or zero, is " + t.mozFrameDelay + ".");
 
   if (t._firstTime) {
-    // eslint-disable-next-line no-self-assign
     t.src = t.src;
     t._firstTime = false;
   } else {
diff --git a/dom/media/test/test_seamless_looping.html b/dom/media/test/test_seamless_looping.html
index c9e3253a5d05..101669563b8d 100644
--- a/dom/media/test/test_seamless_looping.html
+++ b/dom/media/test/test_seamless_looping.html
@@ -97,7 +97,6 @@ function createSrcBuffer() {
 }
 
 function createAudioElement() {
-  /* global audio */
   window.audio = document.createElement("audio");
   audio.src = URL.createObjectURL(new Blob([createSrcBuffer()],
                                   { type: 'audio/wav' }));
@@ -116,7 +115,6 @@ async function playAudioAndStartAnalyzingWaveData(audio) {
 }
 
 function createAudioWaveAnalyser(source) {
-  /* global ac, analyser */
   window.ac = new AudioContext();
   window.analyser = ac.createAnalyser();
   analyser.frequencyBuf = new Float32Array(analyser.frequencyBinCount);
diff --git a/dom/media/test/test_seek-3.html b/dom/media/test/test_seek-3.html
index c030f03d2098..911e33087aa9 100644
--- a/dom/media/test/test_seek-3.html
+++ b/dom/media/test/test_seek-3.html
@@ -20,6 +20,7 @@ const SEEK_TEST_NUMBER = 3;
 function test_seek3(v, seekTime, is, ok, finish) {
 
 // Test seeking works if current time is set but video is not played.
+var startPassed = false;
 var completed = false;
 var gotTimeupdate = false;
 
@@ -41,6 +42,7 @@ function seekStarted() {
 
   ok(v.currentTime >= seekTime - 0.1, "Video currentTime should be around " + seekTime + ": " + v.currentTime);
   v.addEventListener("timeupdate", timeupdate);
+  startPassed = true;
 }
 
 function seekEnded() {
diff --git a/dom/media/test/test_seek-6.html b/dom/media/test/test_seek-6.html
index 32554c4c2fb1..f1a57d0cea07 100644
--- a/dom/media/test/test_seek-6.html
+++ b/dom/media/test/test_seek-6.html
@@ -24,9 +24,10 @@ function test_seek6(v, seekTime, is, ok, finish) {
 var seekCount = 0;
 var completed = false;
 var interval;
+var sum = 0;
 
 function poll() {
-  v.currentTime;
+  sum += v.currentTime;
 }
 
 function startTest() {
diff --git a/dom/media/test/test_seek-7.html b/dom/media/test/test_seek-7.html
index 96139d6f8398..04cfcadd6830 100644
--- a/dom/media/test/test_seek-7.html
+++ b/dom/media/test/test_seek-7.html
@@ -23,6 +23,7 @@ function test_seek7(v, seekTime, is, ok, finish) {
 // otherwise an infinite loop in the Ogg backend occurs.
 var completed = false;
 var thrown1 = false;
+var thrown2 = false;
 var thrown3 = false;
 
 function startTest() {
diff --git a/dom/media/test/test_seekToNextFrame.html b/dom/media/test/test_seekToNextFrame.html
index 755d06e622f5..55128fc19ee6 100644
--- a/dom/media/test/test_seekToNextFrame.html
+++ b/dom/media/test/test_seekToNextFrame.html
@@ -13,68 +13,68 @@
 var manager = new MediaTestManager;
 
 function startTest(test, token) {
-  var video = document.createElement('video');
-  video.preload = "metadata";
-  video.token = token;
-  video.seenSeeking = false;
-  video.seenEnded = false;
+  var v = document.createElement('video');
+  v.preload = "metadata";
+  v.token = token;
+  v.seenSeeking = false;
+  v.seenEnded = false;
 
   var handler = {
     "ontimeout": function() {
-      Log(token, "timed out: ended=" + video.seenEnded);
+      Log(token, "timed out: ended=" + v.seenEnded);
     }
   };
   manager.started(token, handler);
 
-  video.src = test.name;
-  video.name = test.name;
+  v.src = test.name;
+  v.name = test.name;
 
   function callSeekToNextFrame() {
-    video.seekToNextFrame().then(
+    v.seekToNextFrame().then(
       () => {
-        if (!video.seenSeeking) {
-          ok(false, video.token + ": Should have already received seeking event.");
+        if (!v.seenSeeking) {
+          ok(false, v.token + ": Should have already received seeking event.");
         }
-        video.seenSeeking = false;
-        if (!video.ended) {
+        v.seenSeeking = false;
+        if (!v.ended) {
           callSeekToNextFrame();
         }
       },
       () => {
-        ok(false, video.token + ": seekToNextFrame() failed.");
+        ok(false, v.token + ": seekToNextFrame() failed.");
       }
     );
   }
 
-  var onLoadedmetadata = function(t, v) { return function() {
+  var onLoadedmetadata = function(test, v) { return function() {
     callSeekToNextFrame();
-  }}(test, video);
+  }}(test, v);
 
   var finish = function() {
-    video.finished = true;
-    video.removeEventListener("loadedmetadata", onLoadedmetadata);
-    video.removeEventListener("seeking", onSeeking);
-    removeNodeAndSource(video);
-    manager.finished(video.token);
+    v.finished = true;
+    v.removeEventListener("loadedmetadata", onLoadedmetadata);
+    v.removeEventListener("seeking", onSeeking);
+    removeNodeAndSource(v);
+    manager.finished(v.token);
   }
 
-  var onEnded = function(t, v) { return function() {
+  var onEnded = function(test, v) { return function() {
     v.seenEnded = true;
     finish();
-  }}(test, video);
+  }}(test, v);
 
-  var onSeeking = function(t, v) { return function() {
+  var onSeeking = function(test, v) { return function() {
     if (v.seenSeeking) {
       ok(false, v.token + ": Should yet receive seeking event.");
     }
     v.seenSeeking = true;
-  }}(test, video);
+  }}(test, v);
 
-  video.addEventListener("loadedmetadata", onLoadedmetadata);
-  video.addEventListener("seeking", onSeeking);
-  video.addEventListener("ended", onEnded);
+  v.addEventListener("loadedmetadata", onLoadedmetadata);
+  v.addEventListener("seeking", onSeeking);
+  v.addEventListener("ended", onEnded);
 
-  document.body.appendChild(video);
+  document.body.appendChild(v);
 }
 
 SimpleTest.waitForExplicitFinish();
@@ -92,4 +92,4 @@ SpecialPowers.pushPrefEnv(
 </script>
 </pre>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/dom/media/test/test_seek_negative.html b/dom/media/test/test_seek_negative.html
index 98f0b9c9103d..e9c89dcdfafe 100644
--- a/dom/media/test/test_seek_negative.html
+++ b/dom/media/test/test_seek_negative.html
@@ -36,8 +36,8 @@ function startTest(test, token) {
                  "loadedmetadata", "loadeddata", "playing", "ended", "error",
                  "stalled", "emptied", "abort", "waiting", "pause" ];
   function logEvent(e) {
-    var video = e.target;
-    Log(e.target.token, "got " + e.type + " with currentTime = " + video.currentTime);
+    var v = e.target;
+    Log(e.target.token, "got " + e.type + " with currentTime = " + v.currentTime);
   }
   events.forEach(function(e) {
     v.addEventListener(e, logEvent);
diff --git a/dom/media/test/test_seekable1.html b/dom/media/test/test_seekable1.html
index 45c84b35df24..3667d5526c87 100644
--- a/dom/media/test/test_seekable1.html
+++ b/dom/media/test/test_seekable1.html
@@ -23,7 +23,7 @@ function finish_test(element) {
 var tests = [
 // Test using a finite media stream, and a server supporting range requests
 {
-setup(element) {
+setup : function(element) {
           is(element.seekable.length, 0, "seekable.length should be initialy 0.");
           element.addEventListener("loadedmetadata", function() {
               is(element.seekable.length, 1, "seekable.length should be 1 for a server supporting range requests.");
@@ -39,7 +39,7 @@ setup(element) {
 function createTestArray() {
   var A = [];
     for (var k=0; k < gProgressTests.length; k++) {
-      var t = {};
+      var t = new Object();
       t.setup = tests[0].setup;
       t.name = gProgressTests[k].name;
       t.type = gProgressTests[k].type;
diff --git a/dom/media/test/test_source.html b/dom/media/test/test_source.html
index 34cc9e7f8a1e..7cc97e98f711 100644
--- a/dom/media/test/test_source.html
+++ b/dom/media/test/test_source.html
@@ -24,15 +24,16 @@ is(v1.childNodes.length, 0, "should have no children");
 is(a1.childNodes.length, 0, "should have no children");
 
 function newSource(filter) {
+  var test = null;
   var candidates = gSmallTests.filter(function(x){return filter.test(x.type);});
   if (candidates.length > 0) {
     var e = document.createElement("source");
     e.type = candidates[0].type;
     e.src = candidates[0].name;
     return e;
-  }
+  } else {
     return null
-
+  }
 }
 
 var audioLoaded = false;
diff --git a/dom/media/test/test_standalone.html b/dom/media/test/test_standalone.html
index 094052847f78..90b6cd3a0028 100644
--- a/dom/media/test/test_standalone.html
+++ b/dom/media/test/test_standalone.html
@@ -13,7 +13,7 @@
 
 var iframes = [];
 
-for (let i=0; i<gSmallTests.length; ++i) {
+for (var i=0; i<gSmallTests.length; ++i) {
   var test = gSmallTests[i];
 
   // We can't play WAV files in stand alone documents, so just don't
@@ -21,8 +21,8 @@ for (let i=0; i<gSmallTests.length; ++i) {
   var tag = getMajorMimeType(test.type);
   if (tag != "video" || !document.createElement("video").canPlayType(test.type))
     continue;
-
-  let f = document.createElement("iframe");
+  
+  var f = document.createElement("iframe");
   f.src = test.name;
   f._test = test;
   f.id = "frame" + i;
@@ -37,8 +37,8 @@ function filename(uri) {
 
 function doTest()
 {
-  for (let i=0; i<iframes.length; ++i) {
-    let f = document.getElementById(iframes[i].id);
+  for (var i=0; i<iframes.length; ++i) {
+    var f = document.getElementById(iframes[i].id);
     var v = f.contentDocument.body.firstChild;
     is(v.tagName.toLowerCase(), "video", "Is video element");
     var src = filename(v.currentSrc);
diff --git a/dom/media/test/test_streams_capture_origin.html b/dom/media/test/test_streams_capture_origin.html
index 13d5589c0da8..04daedbe0148 100644
--- a/dom/media/test/test_streams_capture_origin.html
+++ b/dom/media/test/test_streams_capture_origin.html
@@ -19,7 +19,6 @@
 </div>
 <pre id="test">
 <script type="application/javascript">
-/* global vin, vout, vout_cors, cin, cout, cout_cors */
 
 /** Test for Bug 1189506 **/
 
diff --git a/dom/media/test/test_streams_element_capture.html b/dom/media/test/test_streams_element_capture.html
index 2aa6deb58705..3c53bc48ebc0 100644
--- a/dom/media/test/test_streams_element_capture.html
+++ b/dom/media/test/test_streams_element_capture.html
@@ -68,8 +68,8 @@ async function startTest(test, token) {
       new Promise(r => vout.onended = r),
       new Promise(r => v.onended = r),
     ]),
-    new Promise((res, rej) => vout.onerror = () => rej(new Error(vout.error.message))),
-    new Promise((res, rej) => v.onerror = () => rej(new Error(v.error.message))),
+    new Promise((_, r) => vout.onerror = _ => r(new Error(vout.error.message))),
+    new Promise((_, r) => v.onerror = _ => r(new Error(v.error.message))),
   ]);
 
   let duration = test.duration;
diff --git a/dom/media/test/test_streams_element_capture_reset.html b/dom/media/test/test_streams_element_capture_reset.html
index a58fcd2c22bc..c1b0fdfc6c7e 100644
--- a/dom/media/test/test_streams_element_capture_reset.html
+++ b/dom/media/test/test_streams_element_capture_reset.html
@@ -19,12 +19,12 @@ var vout = document.getElementById('vout');
 var vout_untilended = document.getElementById('vout_untilended');
 
 function dumpEvent(event) {
-  var video = event.target;
-  info(video.name + " GOT EVENT " + event.type +
-       " currentTime=" + video.currentTime +
-       " paused=" + video.paused +
-       " ended=" + video.ended +
-       " readyState=" + video.readyState);
+  var v = event.target;
+  info(v.name + " GOT EVENT " + event.type +
+       " currentTime=" + v.currentTime +
+       " paused=" + v.paused +
+       " ended=" + v.ended +
+       " readyState=" + v.readyState);
 }
 
 var events = ["timeupdate", "seeking", "seeked", "ended", "playing", "pause"];
diff --git a/dom/media/test/test_streams_element_capture_twice.html b/dom/media/test/test_streams_element_capture_twice.html
index cba8e2ba5a6c..f1baf42775b6 100644
--- a/dom/media/test/test_streams_element_capture_twice.html
+++ b/dom/media/test/test_streams_element_capture_twice.html
@@ -15,12 +15,12 @@ SimpleTest.waitForExplicitFinish();
 let v = document.getElementById('v');
 
 function dumpEvent(event) {
-  let video = event.target;
-  info(video.name + " GOT EVENT " + event.type +
-       " currentTime=" + video.currentTime +
-       " paused=" + video.paused +
-       " ended=" + video.ended +
-       " readyState=" + video.readyState);
+  let v = event.target;
+  info(v.name + " GOT EVENT " + event.type +
+       " currentTime=" + v.currentTime +
+       " paused=" + v.paused +
+       " ended=" + v.ended +
+       " readyState=" + v.readyState);
 }
 
 let events = ["timeupdate", "seeking", "seeked", "ended", "playing", "pause"];
diff --git a/dom/media/test/test_streams_firstframe.html b/dom/media/test/test_streams_firstframe.html
index 3e66116130d5..dc6290bac9ba 100644
--- a/dom/media/test/test_streams_firstframe.html
+++ b/dom/media/test/test_streams_firstframe.html
@@ -10,8 +10,6 @@
 <body>
 <pre id="test">
 <script class="testbody" type="text/javascript">
-/* import-globals-from ../../canvas/test/captureStream_common.js */
-
 async function runTest() {
   const canvas = document.createElement("canvas");
   canvas.getContext("2d");
diff --git a/dom/media/test/test_streams_tracks.html b/dom/media/test/test_streams_tracks.html
index 11e480540231..f798441a4608 100644
--- a/dom/media/test/test_streams_tracks.html
+++ b/dom/media/test/test_streams_tracks.html
@@ -16,6 +16,7 @@ function testTracks(tracks, hasTrack, kind, src) {
   for (var i = 0; i < tracks.length; ++i) {
     var track = tracks[i];
     is(track.kind, kind, "Correct track kind for track " + i + " of " + src);
+    var id = track.id;
     ok(/\{........-....-....-....-............\}/.test(track.id),
        "id " + track.id + " for track " + i + " of " + src + " has correct form");
   }
diff --git a/dom/media/test/test_temporary_file_blob_video_plays.html b/dom/media/test/test_temporary_file_blob_video_plays.html
index 521ce908f663..79bd7dd4b6c1 100644
--- a/dom/media/test/test_temporary_file_blob_video_plays.html
+++ b/dom/media/test/test_temporary_file_blob_video_plays.html
@@ -11,7 +11,6 @@
 <div id="content">
 </div>
 <script class="testbody" type="text/javascript">
-/* import-globals-from ../../canvas/test/captureStream_common.js */
 
 function startTest() {
   var canvas = document.createElement("canvas");
@@ -25,7 +24,7 @@ function startTest() {
 
   var blob;
 
-  let mediaRecorder = new MediaRecorder(stream);
+  mediaRecorder = new MediaRecorder(stream);
   is(mediaRecorder.stream, stream,
      "Media recorder stream = canvas stream at the start of recording");
 
diff --git a/dom/media/test/test_texttrackcue.html b/dom/media/test/test_texttrackcue.html
index 3d9783c07d99..92bb327b6353 100644
--- a/dom/media/test/test_texttrackcue.html
+++ b/dom/media/test/test_texttrackcue.html
@@ -106,7 +106,7 @@ function checkCueSizeAndPosition() {
     cue[prop] = initialVal;
     is(cue[prop], initialVal, `Cue's ${prop} should initially be ${initialVal}`);
     [ 101, -1 ].forEach(function(val) {
-      let exceptionHappened = false;
+      exceptionHappened = false;
       try {
         cue[prop] = val;
       } catch(e) {
@@ -270,6 +270,7 @@ async function checkCActiveCuesDuringVideoPlaying() {
 
   video.addEventListener("timeupdate", function() {
     let activeCues = trackElement.track.activeCues,
+        found = false,
         playbackTime = video.currentTime;
 
     for (let i = 0; i < cueInfo.length; i++) {
diff --git a/dom/media/test/test_texttrackevents_video.html b/dom/media/test/test_texttrackevents_video.html
index 83104633a4b8..cd08beae7eea 100644
--- a/dom/media/test/test_texttrackevents_video.html
+++ b/dom/media/test/test_texttrackevents_video.html
@@ -35,8 +35,7 @@ video.addEventListener("loadedmetadata", function run_tests() {
   // Re-queue run_tests() at the end of the event loop until the track
   // element has loaded its data.
   if (trackElement.readyState == 1) {
-    setTimeout(run_tests, 0);
-    return;
+    return setTimeout(run_tests, 0);
   }
   is(trackElement.readyState, 2, "Track::ReadyState should be set to LOADED.");
   ok('oncuechange' in trackElement.track, "Track::OnCueChange should exist.");
diff --git a/dom/media/test/test_texttracklist.html b/dom/media/test/test_texttracklist.html
index c1d229628989..a1ad992be0ee 100644
--- a/dom/media/test/test_texttracklist.html
+++ b/dom/media/test/test_texttracklist.html
@@ -17,13 +17,13 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=882703
 <script class="testbody" type="text/javascript">
 SimpleTest.waitForExplicitFinish();
 
-let video = document.createElement("video");
+video = document.createElement("video");
 
 isnot(video.textTracks, null, "Video should have a list of TextTracks.");
 
 video.addTextTrack("subtitles", "", "");
 
-let track = video.textTracks[0];
+track = video.textTracks[0];
 video.textTracks.addEventListener("change", changed);
 
 is(track.mode, "hidden", "New TextTrack's mode should be hidden.");
diff --git a/dom/media/test/test_timeupdate_small_files.html b/dom/media/test/test_timeupdate_small_files.html
index fca35e5b7154..5b03894c5a4e 100644
--- a/dom/media/test/test_timeupdate_small_files.html
+++ b/dom/media/test/test_timeupdate_small_files.html
@@ -19,13 +19,13 @@ var manager = new MediaTestManager;
 
 function ended(e) {
   var v = e.target;
-  ++v.counter.ended;
-  is(v.counter.ended, 1, v._name + " should see ended only once");
-  ok(v.counter.timeupdate > 0, v._name + " should see at least one timeupdate: " + v.currentTime);
+  ++v.counter["ended"];
+  is(v.counter["ended"], 1, v._name + " should see ended only once");
+  ok(v.counter["timeupdate"] > 0, v._name + " should see at least one timeupdate: " + v.currentTime);
 
   // Rest event counters for we don't allow events after ended.
-  eventsToLog.forEach(function(event) {
-    v.counter[event] = 0;
+  eventsToLog.forEach(function(e) {
+    v.counter[e] = 0;
   });
 
   // Finish the test after 500ms. We shouldn't receive any timeupdate events
@@ -39,8 +39,8 @@ function ended(e) {
       // invoked when it's removed from a document), and we don't want those
       // confusing the test results.
       v.removeEventListener("ended", ended);
-      eventsToLog.forEach(function(event) {
-        v.removeEventListener(event, logEvent);
+      eventsToLog.forEach(function(e) {
+        v.removeEventListener(e, logEvent);
       });
       removeNodeAndSource(v);
       manager.finished(v.token);
@@ -55,7 +55,7 @@ var eventsToLog = ["play", "canplay", "canplaythrough", "loadstart", "loadedmeta
 function logEvent(event) {
   var v = event.target;
   ++v.counter[event.type];
-  if (v.counter.ended > 0) {
+  if (v.counter["ended"] > 0) {
     is(v.counter[event.type], 0, v._name + " got unexpected " + event.type + " after ended");
   }
 }
@@ -75,7 +75,7 @@ function startTest(test, token) {
     v.counter[e] = 0;
   });
   v.addEventListener("ended", ended);
-  v.counter.ended = 0;
+  v.counter["ended"] = 0;
   document.body.appendChild(v);
   v.play();
 }
diff --git a/dom/media/test/test_trackelementsrc.html b/dom/media/test/test_trackelementsrc.html
index f98e79c60599..81e151f70bcc 100644
--- a/dom/media/test/test_trackelementsrc.html
+++ b/dom/media/test/test_trackelementsrc.html
@@ -29,8 +29,7 @@ SpecialPowers.pushPrefEnv({"set": [["media.webvtt.regions.enabled", true]]},
 
     video.addEventListener("loadedmetadata", function metadata() {
       if (trackElement.readyState <= 1) {
-        setTimeout(metadata, 0);
-        return;
+        return setTimeout(metadata, 0);
       }
       is(video.textTracks.length, 1, "Length should be 1.");
       is(video.textTracks[0].cues.length, 6, "Cue length should be 6.");
@@ -51,3 +50,4 @@ SpecialPowers.pushPrefEnv({"set": [["media.webvtt.regions.enabled", true]]},
 </pre>
 </body>
 </html>
+
diff --git a/dom/media/test/test_trackevent.html b/dom/media/test/test_trackevent.html
index ffba7d33ec8e..1fd0f979803f 100644
--- a/dom/media/test/test_trackevent.html
+++ b/dom/media/test/test_trackevent.html
@@ -44,8 +44,8 @@ trackList.onaddtrack = function(event) {
 };
 
 var label = ["Oasis", "Coldplay", "t.A.T.u", ""];
-var language = ["en-CA", "en-GB", "ru", ""];
-var kind = ["subtitles", "captions", "chapters", "subtitles"];
+language = ["en-CA", "en-GB", "ru", ""];
+kind = ["subtitles", "captions", "chapters", "subtitles"];
 
 var textTrack = new Array(4);
 for (var i = 0; i < 3; ++i) {
@@ -67,3 +67,4 @@ video.appendChild(trackElement);
 </pre>
 </body>
 </html>
+
diff --git a/dom/media/test/test_videoPlaybackQuality_totalFrames.html b/dom/media/test/test_videoPlaybackQuality_totalFrames.html
index 1b69a3b64fdd..41fa8901351b 100644
--- a/dom/media/test/test_videoPlaybackQuality_totalFrames.html
+++ b/dom/media/test/test_videoPlaybackQuality_totalFrames.html
@@ -19,10 +19,10 @@ var startTest = function(test, token) {
   v.src = test.name;
 
   function ended(event) {
-    var video = event.target;
-    is(video.getVideoPlaybackQuality().totalVideoFrames, test.totalFrameCount,test.name+ " totalFrames should match!");
-    removeNodeAndSource(video);
-    manager.finished(video.token);
+    var v = event.target;
+    is(v.getVideoPlaybackQuality().totalVideoFrames, test.totalFrameCount,test.name+ " totalFrames should match!");
+    removeNodeAndSource(v);
+    manager.finished(v.token);
   }
   v.addEventListener("ended", ended);
   v.play();
diff --git a/dom/media/test/test_volume.html b/dom/media/test/test_volume.html
index 3d9e5bd91aac..952a2d175141 100644
--- a/dom/media/test/test_volume.html
+++ b/dom/media/test/test_volume.html
@@ -23,9 +23,9 @@ function test(element, value, shouldThrow) {
 }
 
 
-var ids = [document.getElementById('v1'), document.getElementById('a1')];
+var ids = new Array(document.getElementById('v1'), document.getElementById('a1'));
 
-for (let i=0; i<ids.length; i++) {
+for (i=0; i<ids.length; i++) {
   var element = ids[i];
   test(element, 0.0, null);
   test(element, 1.0, null);
@@ -33,8 +33,8 @@ for (let i=0; i<ids.length; i++) {
   test(element, 1.1, "IndexSizeError");
   test(element, undefined, "TypeError");
   test(element, NaN, "TypeError");
-}
-
+}  
+ 
 </script>
 </pre>
 </body>
diff --git a/dom/media/test/test_vp9_superframes.html b/dom/media/test/test_vp9_superframes.html
index c570561b3194..7a128a4ac035 100644
--- a/dom/media/test/test_vp9_superframes.html
+++ b/dom/media/test/test_vp9_superframes.html
@@ -16,7 +16,7 @@ function test() {
   video.src = "vp9-superframes.webm";
   video.play();
   video.addEventListener("ended", function () {
-    let vpq = video.getVideoPlaybackQuality();
+    vpq = video.getVideoPlaybackQuality();
     is(vpq.totalVideoFrames, 120, "totalVideoFrames must contains 120 frames");
     SimpleTest.finish();
   });
diff --git a/dom/media/test/test_webvtt_positionalign.html b/dom/media/test/test_webvtt_positionalign.html
index 267fd52f9326..28959214b417 100644
--- a/dom/media/test/test_webvtt_positionalign.html
+++ b/dom/media/test/test_webvtt_positionalign.html
@@ -52,7 +52,7 @@ function runTest() {
   info("--- check the cue's computed position alignment ---");
   // The "computedPositionAlign" is the chrome-only attributes, we need to get
   // the chrome privilege for cues.
-  let cuesChrome = SpecialPowers.wrap(cues);
+  cuesChrome = SpecialPowers.wrap(cues);
   expectedAlignment.push("line-left", "line-right", "center");
   for (;idx < expectedAlignment.length; idx++) {
     is(cuesChrome[idx].computedPositionAlign, expectedAlignment[idx],