Merge branch 'master' into releaseRC_20210225

86 files changed, 0 insertions, 614 deletions

diff --git a/testing/web-platform/meta/encrypted-media/Google/__dir__.ini b/testing/web-platform/meta/encrypted-media/Google/__dir__.ini
deleted file mode 100644
index c157757b1..000000000
--- a/testing/web-platform/meta/encrypted-media/Google/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: @False
\ No newline at end of file
diff --git a/testing/web-platform/meta/encrypted-media/__dir__.ini b/testing/web-platform/meta/encrypted-media/__dir__.ini
deleted file mode 100644
index a7ef7552a..000000000
--- a/testing/web-platform/meta/encrypted-media/__dir__.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-disabled:
-  if (os == "linux"): https://bugzilla.mozilla.org/show_bug.cgi?id=1301418
diff --git a/testing/web-platform/meta/encrypted-media/clearkey-events-session-closed-event.html.ini b/testing/web-platform/meta/encrypted-media/clearkey-events-session-closed-event.html.ini
deleted file mode 100644
index 0061b11eb..000000000
--- a/testing/web-platform/meta/encrypted-media/clearkey-events-session-closed-event.html.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[clearkey-events-session-closed-event.html]
-  type: testharness
-  [org.w3.clearkey test MediaKeySession closed event.]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-
diff --git a/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-destroy-persistent-license.html.ini b/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-destroy-persistent-license.html.ini
deleted file mode 100644
index b25203d4c..000000000
--- a/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-destroy-persistent-license.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[clearkey-mp4-playback-destroy-persistent-license.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-persistent-license-events.html.ini b/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-persistent-license-events.html.ini
deleted file mode 100644
index c51a0f5b0..000000000
--- a/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-persistent-license-events.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[clearkey-mp4-playback-persistent-license-events.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-persistent-license.html.ini b/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-persistent-license.html.ini
deleted file mode 100644
index 9bc2584a5..000000000
--- a/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-persistent-license.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[clearkey-mp4-playback-persistent-license.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-persistent-usage-record-events.html.ini b/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-persistent-usage-record-events.html.ini
deleted file mode 100644
index 2532cfe19..000000000
--- a/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-persistent-usage-record-events.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[clearkey-mp4-playback-persistent-usage-record-events.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-persistent-usage-record.html.ini b/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-persistent-usage-record.html.ini
deleted file mode 100644
index fa8e1f87c..000000000
--- a/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-persistent-usage-record.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[clearkey-mp4-playback-persistent-usage-record.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-retrieve-destroy-persistent-license.html.ini b/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-retrieve-destroy-persistent-license.html.ini
deleted file mode 100644
index d24c178dd..000000000
--- a/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-retrieve-destroy-persistent-license.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[clearkey-mp4-playback-retrieve-destroy-persistent-license.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-retrieve-persistent-license.html.ini b/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-retrieve-persistent-license.html.ini
deleted file mode 100644
index cd0892883..000000000
--- a/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-retrieve-persistent-license.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[clearkey-mp4-playback-retrieve-persistent-license.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-retrieve-persistent-usage-record.html.ini b/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-retrieve-persistent-usage-record.html.ini
deleted file mode 100644
index 6dcf7beee..000000000
--- a/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-retrieve-persistent-usage-record.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[clearkey-mp4-playback-retrieve-persistent-usage-record.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-clear-encrypted.html.ini b/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-clear-encrypted.html.ini
deleted file mode 100644
index c01f3bc2e..000000000
--- a/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-clear-encrypted.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[clearkey-mp4-playback-temporary-clear-encrypted.html]
-  type: testharness
-  [org.w3.clearkey, temporary, mp4, playback, single key, clear then encrypted content]
-    expected:
-      if (os == "win") and (version == "5.1.2600"): TIMEOUT
-
diff --git a/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-encrypted-clear-sources.html.ini b/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-encrypted-clear-sources.html.ini
deleted file mode 100644
index 02df71b26..000000000
--- a/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-encrypted-clear-sources.html.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[clearkey-mp4-playback-temporary-encrypted-clear-sources.html]
-  type: testharness
-  [org.w3.clearkey, temporary, mp4, playback, encrypted and clear sources]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-
diff --git a/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-encrypted-clear.html.ini b/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-encrypted-clear.html.ini
deleted file mode 100644
index 00c5c8c09..000000000
--- a/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-encrypted-clear.html.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-[clearkey-mp4-playback-temporary-encrypted-clear.html]
-  type: testharness
-  expected:
-    if not debug and not e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86") and (bits == 32): TIMEOUT
-    if not debug and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86") and (bits == 32): TIMEOUT
-    if debug and not e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if debug and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): TIMEOUT
-  [org.w3.clearkey, temporary, mp4, playback, single key, encrypted then clear content]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if not debug and not e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86") and (bits == 32): TIMEOUT
-      if not debug and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and not e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if debug and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): TIMEOUT
-
diff --git a/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-events.html.ini b/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-events.html.ini
deleted file mode 100644
index 552e99c60..000000000
--- a/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-events.html.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-[clearkey-mp4-playback-temporary-events.html]
-  type: testharness
-  disabled:
-    https://bugzilla.mozilla.org/show_bug.cgi?id=1312914
-  [org.w3.clearkey, sucessful playback and events, temporary, mp4, set src before setMediaKeys]
-    expected:
-      if (os == "win") and (version == "5.1.2600"): TIMEOUT
-
-  [org.w3.clearkey, temporary, mp4, playback, check events]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and not e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and not e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
-
diff --git a/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-multikey-sequential-readyState.html.ini b/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-multikey-sequential-readyState.html.ini
deleted file mode 100644
index 136914a7b..000000000
--- a/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-multikey-sequential-readyState.html.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-[clearkey-mp4-playback-temporary-multikey-sequential-readyState.html]
-  type: testharness
-  disabled:
-    if (os == "win"): https://bugzilla.mozilla.org/show_bug.cgi?id=1322087
-  [org.w3.clearkey, successful playback, temporary, mp4, multiple keys, sequential, readyState]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-
diff --git a/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-multikey-sequential.html.ini b/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-multikey-sequential.html.ini
deleted file mode 100644
index 82a68b0f4..000000000
--- a/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-multikey-sequential.html.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-[clearkey-mp4-playback-temporary-multikey-sequential.html]
-  type: testharness
-  disabled:
-    https://bugzilla.mozilla.org/show_bug.cgi?id=1312914
-  expected:
-    if os == "linux": TIMEOUT
-  [org.w3.clearkey, successful playback, temporary, mp4, multiple keys and sessions, sequential]
-    expected:
-      if os == "mac": TIMEOUT
-      if (os == "win") and (version == "5.1.2600"): TIMEOUT
-
-  [org.w3.clearkey, successful playback, temporary, mp4, multiple keys, sequential]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if not debug and not e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and not e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and not e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and not e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
-
diff --git a/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-multikey.html.ini b/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-multikey.html.ini
deleted file mode 100644
index 193bdbc17..000000000
--- a/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-multikey.html.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-[clearkey-mp4-playback-temporary-multikey.html]
-  type: testharness
-  [org.w3.clearkey, successful playback, temporary, mp4, multiple keys, single session, audio/video]
-    expected:
-      if (os == "win") and (version == "5.1.2600"): TIMEOUT
-
-  [org.w3.clearkey, temporary, mp4, playback, multikey audio/video]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-
diff --git a/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-multisession.html.ini b/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-multisession.html.ini
deleted file mode 100644
index 7ecf7a356..000000000
--- a/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-multisession.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[clearkey-mp4-playback-temporary-multisession.html]
-  type: testharness
-  [org.w3.clearkey, temporary, mp4, playback with multiple sessions, multikey video]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
diff --git a/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-setMediaKeys-after-src.html.ini b/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-setMediaKeys-after-src.html.ini
deleted file mode 100644
index 3d3b6f450..000000000
--- a/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-setMediaKeys-after-src.html.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[clearkey-mp4-playback-temporary-setMediaKeys-after-src.html]
-  type: testharness
-  [org.w3.clearkey, temporary, mp4, playback, setMediaKeys after setting video.src]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-
diff --git a/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-setMediaKeys-after-update.html.ini b/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-setMediaKeys-after-update.html.ini
deleted file mode 100644
index 76e3ae81a..000000000
--- a/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-setMediaKeys-after-update.html.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[clearkey-mp4-playback-temporary-setMediaKeys-after-update.html]
-  type: testharness
-  [org.w3.clearkey, temporary, mp4, playback, setMediaKeys after updating session]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-
diff --git a/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-setMediaKeys-immediately.html.ini b/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-setMediaKeys-immediately.html.ini
deleted file mode 100644
index 1248f644f..000000000
--- a/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-setMediaKeys-immediately.html.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[clearkey-mp4-playback-temporary-setMediaKeys-immediately.html]
-  type: testharness
-  [org.w3.clearkey, temporary, mp4, playback, setMediaKeys first]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-
diff --git a/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-setMediaKeys-onencrypted.html.ini b/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-setMediaKeys-onencrypted.html.ini
deleted file mode 100644
index 3f7ae1986..000000000
--- a/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-setMediaKeys-onencrypted.html.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[clearkey-mp4-playback-temporary-setMediaKeys-onencrypted.html]
-  type: testharness
-  [org.w3.clearkey, temporary, mp4, playback, setMediaKeys in encrypted event]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-
diff --git a/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-two-videos.html.ini b/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-two-videos.html.ini
deleted file mode 100644
index 510515535..000000000
--- a/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-two-videos.html.ini
+++ /dev/null
@@ -1,15 +0,0 @@
-[clearkey-mp4-playback-temporary-two-videos.html]
-  type: testharness
-  expected:
-    if (os == "win") and (version == "5.1.2600"): TIMEOUT
-  [org.w3.clearkey, sucessful playback, temporary, mp4, set src before setMediaKeys]
-    expected:
-      if (os == "win") and (version == "5.1.2600"): TIMEOUT
-
-  [org.w3.clearkey, temporary, mp4, playback two videos]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-
diff --git a/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-waitingforkey.html.ini b/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-waitingforkey.html.ini
deleted file mode 100644
index f0f3874d8..000000000
--- a/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-waitingforkey.html.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[clearkey-mp4-playback-temporary-waitingforkey.html]
-  type: testharness
-  [org.w3.clearkey, successful playback, temporary, mp4, waitingforkey event, 1 key]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-
diff --git a/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary.html.ini b/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary.html.ini
deleted file mode 100644
index 6927269e6..000000000
--- a/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary.html.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-[clearkey-mp4-playback-temporary.html]
-  type: testharness
-  [org.w3.clearkey, sucessful playback, temporary, mp4, set src before setMediaKeys]
-    expected:
-      if (os == "win") and (version == "5.1.2600"): TIMEOUT
-
-  [org.w3.clearkey, temporary, mp4, playback, single key]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-
diff --git a/testing/web-platform/meta/encrypted-media/clearkey-mp4-requestmediakeysystemaccess.html.ini b/testing/web-platform/meta/encrypted-media/clearkey-mp4-requestmediakeysystemaccess.html.ini
deleted file mode 100644
index 01503c614..000000000
--- a/testing/web-platform/meta/encrypted-media/clearkey-mp4-requestmediakeysystemaccess.html.ini
+++ /dev/null
@@ -1,99 +0,0 @@
-[clearkey-mp4-requestmediakeysystemaccess.html]
-  type: testharness
-  [Basic supported configuration]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-
-  [Partially supported configuration]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-
-  [Supported audio codec]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-
-  [ContentType formatting must be preserved]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-
-  [Leading space in contentType]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-
-  [Space before ; in contentType]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-
-  [Trailing space in contentType]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-
-  [Space at start of codecs parameter]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-
-  [Space at end of codecs parameter]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-
-  [Video/]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-
-  [Codecs=]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-
-  [Upper case MIME type]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-
-  [CODECS=]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-
-  [org.w3.clearkey, requestMediaKeySystemAccess: Empty Key System () should result in InvalidAccessError]
-    expected: FAIL
-
-  [org.w3.clearkey, requestMediaKeySystemAccess: Empty supportedConfigurations should result in InvalidAccessError]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/encrypted-media/clearkey-mp4-reset-src-after-setmediakeys.html.ini b/testing/web-platform/meta/encrypted-media/clearkey-mp4-reset-src-after-setmediakeys.html.ini
deleted file mode 100644
index 294468727..000000000
--- a/testing/web-platform/meta/encrypted-media/clearkey-mp4-reset-src-after-setmediakeys.html.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[clearkey-mp4-reset-src-after-setmediakeys.html]
-  type: testharness
-  [Reset src after setMediaKeys().]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-
diff --git a/testing/web-platform/meta/encrypted-media/clearkey-mp4-setmediakeys-again-after-resetting-src.html.ini b/testing/web-platform/meta/encrypted-media/clearkey-mp4-setmediakeys-again-after-resetting-src.html.ini
deleted file mode 100644
index 3595f8a17..000000000
--- a/testing/web-platform/meta/encrypted-media/clearkey-mp4-setmediakeys-again-after-resetting-src.html.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[clearkey-mp4-setmediakeys-again-after-resetting-src.html]
-  type: testharness
-  [org.w3.clearkey, setmediakeys again after resetting src]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-
diff --git a/testing/web-platform/meta/encrypted-media/clearkey-mp4-setmediakeys-multiple-times-with-different-mediakeys.html.ini b/testing/web-platform/meta/encrypted-media/clearkey-mp4-setmediakeys-multiple-times-with-different-mediakeys.html.ini
deleted file mode 100644
index d30eea7ab..000000000
--- a/testing/web-platform/meta/encrypted-media/clearkey-mp4-setmediakeys-multiple-times-with-different-mediakeys.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[clearkey-mp4-setmediakeys-multiple-times-with-different-mediakeys.html]
-  type: testharness
-  expected: ERROR
diff --git a/testing/web-platform/meta/encrypted-media/clearkey-mp4-setmediakeys-multiple-times-with-the-same-mediakeys.html.ini b/testing/web-platform/meta/encrypted-media/clearkey-mp4-setmediakeys-multiple-times-with-the-same-mediakeys.html.ini
deleted file mode 100644
index dbae0683b..000000000
--- a/testing/web-platform/meta/encrypted-media/clearkey-mp4-setmediakeys-multiple-times-with-the-same-mediakeys.html.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[clearkey-mp4-setmediakeys-multiple-times-with-the-same-mediakeys.html]
-  type: testharness
-  [org.w3.clearkey, setmediakeys multiple times with the same mediakeys]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-
diff --git a/testing/web-platform/meta/encrypted-media/clearkey-mp4-setmediakeys.html.ini b/testing/web-platform/meta/encrypted-media/clearkey-mp4-setmediakeys.html.ini
deleted file mode 100644
index 48e510276..000000000
--- a/testing/web-platform/meta/encrypted-media/clearkey-mp4-setmediakeys.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[clearkey-mp4-setmediakeys.html]
-  type: testharness
-  [org.w3.clearkey, setMediaKeys]
-    expected: TIMEOUT
-
diff --git a/testing/web-platform/meta/encrypted-media/clearkey-mp4-syntax-mediakeys.html.ini b/testing/web-platform/meta/encrypted-media/clearkey-mp4-syntax-mediakeys.html.ini
deleted file mode 100644
index b9a9c5d51..000000000
--- a/testing/web-platform/meta/encrypted-media/clearkey-mp4-syntax-mediakeys.html.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-[clearkey-mp4-syntax-mediakeys.html]
-  type: testharness
-  [org.w3.clearkey test MediaKeys attribute syntax]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-
-  [org.w3.clearkey test MediaKeys setServerCertificate() exceptions.]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-
-  [org.w3.clearkey test MediaKeys setServerCertificate() syntax with non-empty certificate.]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-
diff --git a/testing/web-platform/meta/encrypted-media/clearkey-mp4-syntax-mediakeysession.html.ini b/testing/web-platform/meta/encrypted-media/clearkey-mp4-syntax-mediakeysession.html.ini
deleted file mode 100644
index 13b7a7800..000000000
--- a/testing/web-platform/meta/encrypted-media/clearkey-mp4-syntax-mediakeysession.html.ini
+++ /dev/null
@@ -1,60 +0,0 @@
-[clearkey-mp4-syntax-mediakeysession.html]
-  type: testharness
-  [org.w3.clearkey test MediaKeySession generateRequest() exceptions.]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-
-  [org.w3.clearkey test MediaKeySession load() exceptions.]
-    expected:
-      if not debug and not e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86") and (bits == 32): PASS
-      if not debug and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86") and (bits == 32): PASS
-      if debug and not e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-      if not debug and e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): PASS
-      if debug and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-      if not debug and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-      if not debug and not e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-      if not debug and not e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): PASS
-      if debug and e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): PASS
-      if debug and not e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-      if debug and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-      if debug and not e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): PASS
-      FAIL
-
-  [org.w3.clearkey test if MediaKeySession generateRequest() resolves for various sessions]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-
-  [org.w3.clearkey test MediaKeySession update() exceptions.]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-
-  [org.w3.clearkey test MediaKeySession close() exceptions.]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-
-  [org.w3.clearkey test MediaKeySession remove() exceptions.]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-
-  [org.w3.clearkey test MediaKeySession attribute syntax.]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-
diff --git a/testing/web-platform/meta/encrypted-media/clearkey-mp4-syntax-mediakeysystemaccess.html.ini b/testing/web-platform/meta/encrypted-media/clearkey-mp4-syntax-mediakeysystemaccess.html.ini
deleted file mode 100644
index 38403e277..000000000
--- a/testing/web-platform/meta/encrypted-media/clearkey-mp4-syntax-mediakeysystemaccess.html.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-[clearkey-mp4-syntax-mediakeysystemaccess.html]
-  type: testharness
-  [org.w3.clearkey test requestMediaKeySystemAccess() exceptions.]
-    expected: FAIL
-
-  [org.w3.clearkey test MediaKeySystemAccess attribute syntax.]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-
diff --git a/testing/web-platform/meta/encrypted-media/clearkey-mp4-waiting-for-a-key.html.ini b/testing/web-platform/meta/encrypted-media/clearkey-mp4-waiting-for-a-key.html.ini
deleted file mode 100644
index 97217ac8c..000000000
--- a/testing/web-platform/meta/encrypted-media/clearkey-mp4-waiting-for-a-key.html.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[clearkey-mp4-waiting-for-a-key.html]
-  type: testharness
-  [Waiting for a key.]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-
diff --git a/testing/web-platform/meta/encrypted-media/clearkey-update-non-ascii-input.html.ini b/testing/web-platform/meta/encrypted-media/clearkey-update-non-ascii-input.html.ini
deleted file mode 100644
index 04df07ec6..000000000
--- a/testing/web-platform/meta/encrypted-media/clearkey-update-non-ascii-input.html.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[clearkey-update-non-ascii-input.html]
-  type: testharness
-  [org.w3.clearkey test handling of non-ASCII responses for update()]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-
diff --git a/testing/web-platform/meta/encrypted-media/drm-check-initdata-type.html.ini b/testing/web-platform/meta/encrypted-media/drm-check-initdata-type.html.ini
deleted file mode 100644
index 15a9407a1..000000000
--- a/testing/web-platform/meta/encrypted-media/drm-check-initdata-type.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drm-check-initdata-type.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/drm-events-session-closed-event.html.ini b/testing/web-platform/meta/encrypted-media/drm-events-session-closed-event.html.ini
deleted file mode 100644
index dd58b8853..000000000
--- a/testing/web-platform/meta/encrypted-media/drm-events-session-closed-event.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drm-events-session-closed-event.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/drm-events.html.ini b/testing/web-platform/meta/encrypted-media/drm-events.html.ini
deleted file mode 100644
index 7e60ee4fe..000000000
--- a/testing/web-platform/meta/encrypted-media/drm-events.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drm-events.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/drm-expiration.html.ini b/testing/web-platform/meta/encrypted-media/drm-expiration.html.ini
deleted file mode 100644
index 13dee086e..000000000
--- a/testing/web-platform/meta/encrypted-media/drm-expiration.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drm-expiration.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/drm-generate-request-disallowed-input.html.ini b/testing/web-platform/meta/encrypted-media/drm-generate-request-disallowed-input.html.ini
deleted file mode 100644
index dc46cc3e9..000000000
--- a/testing/web-platform/meta/encrypted-media/drm-generate-request-disallowed-input.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drm-generate-request-disallowed-input.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/drm-invalid-license.html.ini b/testing/web-platform/meta/encrypted-media/drm-invalid-license.html.ini
deleted file mode 100644
index 8945c7c4a..000000000
--- a/testing/web-platform/meta/encrypted-media/drm-invalid-license.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drm-invalid-license.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/drm-keystatuses-multiple-sessions.html.ini b/testing/web-platform/meta/encrypted-media/drm-keystatuses-multiple-sessions.html.ini
deleted file mode 100644
index a68be1fc8..000000000
--- a/testing/web-platform/meta/encrypted-media/drm-keystatuses-multiple-sessions.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drm-keystatuses-multiple-sessions.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/drm-keystatuses.html.ini b/testing/web-platform/meta/encrypted-media/drm-keystatuses.html.ini
deleted file mode 100644
index bcdc97626..000000000
--- a/testing/web-platform/meta/encrypted-media/drm-keystatuses.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drm-keystatuses.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/drm-mp4-onencrypted.html.ini b/testing/web-platform/meta/encrypted-media/drm-mp4-onencrypted.html.ini
deleted file mode 100644
index 17293161b..000000000
--- a/testing/web-platform/meta/encrypted-media/drm-mp4-onencrypted.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drm-mp4-onencrypted.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/drm-mp4-playback-destroy-persistent-license.html.ini b/testing/web-platform/meta/encrypted-media/drm-mp4-playback-destroy-persistent-license.html.ini
deleted file mode 100644
index c8965e4e4..000000000
--- a/testing/web-platform/meta/encrypted-media/drm-mp4-playback-destroy-persistent-license.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drm-mp4-playback-destroy-persistent-license.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/drm-mp4-playback-persistent-license-events.html.ini b/testing/web-platform/meta/encrypted-media/drm-mp4-playback-persistent-license-events.html.ini
deleted file mode 100644
index 132bad223..000000000
--- a/testing/web-platform/meta/encrypted-media/drm-mp4-playback-persistent-license-events.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drm-mp4-playback-persistent-license-events.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/drm-mp4-playback-persistent-license.html.ini b/testing/web-platform/meta/encrypted-media/drm-mp4-playback-persistent-license.html.ini
deleted file mode 100644
index 925e6bd2d..000000000
--- a/testing/web-platform/meta/encrypted-media/drm-mp4-playback-persistent-license.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drm-mp4-playback-persistent-license.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/drm-mp4-playback-persistent-usage-record-events.html.ini b/testing/web-platform/meta/encrypted-media/drm-mp4-playback-persistent-usage-record-events.html.ini
deleted file mode 100644
index 4e75eeb4b..000000000
--- a/testing/web-platform/meta/encrypted-media/drm-mp4-playback-persistent-usage-record-events.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drm-mp4-playback-persistent-usage-record-events.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/drm-mp4-playback-persistent-usage-record.html.ini b/testing/web-platform/meta/encrypted-media/drm-mp4-playback-persistent-usage-record.html.ini
deleted file mode 100644
index 7048a1252..000000000
--- a/testing/web-platform/meta/encrypted-media/drm-mp4-playback-persistent-usage-record.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drm-mp4-playback-persistent-usage-record.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/drm-mp4-playback-retrieve-destroy-persistent-license.html.ini b/testing/web-platform/meta/encrypted-media/drm-mp4-playback-retrieve-destroy-persistent-license.html.ini
deleted file mode 100644
index 23ff9cfc1..000000000
--- a/testing/web-platform/meta/encrypted-media/drm-mp4-playback-retrieve-destroy-persistent-license.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drm-mp4-playback-retrieve-destroy-persistent-license.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/drm-mp4-playback-retrieve-persistent-license.html.ini b/testing/web-platform/meta/encrypted-media/drm-mp4-playback-retrieve-persistent-license.html.ini
deleted file mode 100644
index cfabbfc25..000000000
--- a/testing/web-platform/meta/encrypted-media/drm-mp4-playback-retrieve-persistent-license.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drm-mp4-playback-retrieve-persistent-license.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/drm-mp4-playback-retrieve-persistent-usage-record.html.ini b/testing/web-platform/meta/encrypted-media/drm-mp4-playback-retrieve-persistent-usage-record.html.ini
deleted file mode 100644
index 11a7b4b88..000000000
--- a/testing/web-platform/meta/encrypted-media/drm-mp4-playback-retrieve-persistent-usage-record.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drm-mp4-playback-retrieve-persistent-usage-record.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary-clear-encrypted.html.ini b/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary-clear-encrypted.html.ini
deleted file mode 100644
index 58933121a..000000000
--- a/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary-clear-encrypted.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drm-mp4-playback-temporary-clear-encrypted.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary-encrypted-clear-sources.html.ini b/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary-encrypted-clear-sources.html.ini
deleted file mode 100644
index 9b7b002b6..000000000
--- a/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary-encrypted-clear-sources.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drm-mp4-playback-temporary-encrypted-clear-sources.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary-encrypted-clear.html.ini b/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary-encrypted-clear.html.ini
deleted file mode 100644
index 7ddeb52d1..000000000
--- a/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary-encrypted-clear.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drm-mp4-playback-temporary-encrypted-clear.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary-events.html.ini b/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary-events.html.ini
deleted file mode 100644
index 1598ebcd4..000000000
--- a/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary-events.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drm-mp4-playback-temporary-events.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary-expired.html.ini b/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary-expired.html.ini
deleted file mode 100644
index aa0b39a97..000000000
--- a/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary-expired.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drm-mp4-playback-temporary-expired.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary-multikey-sequential-readyState.html.ini b/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary-multikey-sequential-readyState.html.ini
deleted file mode 100644
index b514c5578..000000000
--- a/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary-multikey-sequential-readyState.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drm-mp4-playback-temporary-multikey-sequential-readyState.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary-multikey-sequential.html.ini b/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary-multikey-sequential.html.ini
deleted file mode 100644
index 34a648555..000000000
--- a/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary-multikey-sequential.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drm-mp4-playback-temporary-multikey-sequential.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary-multikey.html.ini b/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary-multikey.html.ini
deleted file mode 100644
index a6bff436f..000000000
--- a/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary-multikey.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drm-mp4-playback-temporary-multikey.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary-multisession.html.ini b/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary-multisession.html.ini
deleted file mode 100644
index 161e69f4e..000000000
--- a/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary-multisession.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drm-mp4-playback-temporary-multisession.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary-setMediaKeys-after-src.html.ini b/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary-setMediaKeys-after-src.html.ini
deleted file mode 100644
index 86b82af89..000000000
--- a/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary-setMediaKeys-after-src.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drm-mp4-playback-temporary-setMediaKeys-after-src.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary-setMediaKeys-after-update.html.ini b/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary-setMediaKeys-after-update.html.ini
deleted file mode 100644
index 09c58843c..000000000
--- a/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary-setMediaKeys-after-update.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drm-mp4-playback-temporary-setMediaKeys-after-update.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary-setMediaKeys-immediately.html.ini b/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary-setMediaKeys-immediately.html.ini
deleted file mode 100644
index fd42e7010..000000000
--- a/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary-setMediaKeys-immediately.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drm-mp4-playback-temporary-setMediaKeys-immediately.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary-setMediaKeys-onencrypted.html.ini b/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary-setMediaKeys-onencrypted.html.ini
deleted file mode 100644
index 93b0524a7..000000000
--- a/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary-setMediaKeys-onencrypted.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drm-mp4-playback-temporary-setMediaKeys-onencrypted.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary-two-videos.html.ini b/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary-two-videos.html.ini
deleted file mode 100644
index a394b49e9..000000000
--- a/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary-two-videos.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drm-mp4-playback-temporary-two-videos.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary-waitingforkey.html.ini b/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary-waitingforkey.html.ini
deleted file mode 100644
index 83c3ecfa9..000000000
--- a/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary-waitingforkey.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drm-mp4-playback-temporary-waitingforkey.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary.html.ini b/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary.html.ini
deleted file mode 100644
index 5f6d12182..000000000
--- a/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drm-mp4-playback-temporary.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/drm-mp4-requestmediakeysystemaccess.html.ini b/testing/web-platform/meta/encrypted-media/drm-mp4-requestmediakeysystemaccess.html.ini
deleted file mode 100644
index 6e7ca0e7b..000000000
--- a/testing/web-platform/meta/encrypted-media/drm-mp4-requestmediakeysystemaccess.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drm-mp4-requestmediakeysystemaccess.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/drm-mp4-reset-src-after-setmediakeys.html.ini b/testing/web-platform/meta/encrypted-media/drm-mp4-reset-src-after-setmediakeys.html.ini
deleted file mode 100644
index 6c122e7e5..000000000
--- a/testing/web-platform/meta/encrypted-media/drm-mp4-reset-src-after-setmediakeys.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drm-mp4-reset-src-after-setmediakeys.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/drm-mp4-setmediakeys-again-after-playback.html.ini b/testing/web-platform/meta/encrypted-media/drm-mp4-setmediakeys-again-after-playback.html.ini
deleted file mode 100644
index 9ace8f7eb..000000000
--- a/testing/web-platform/meta/encrypted-media/drm-mp4-setmediakeys-again-after-playback.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drm-mp4-setmediakeys-again-after-playback.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/drm-mp4-setmediakeys-again-after-resetting-src.html.ini b/testing/web-platform/meta/encrypted-media/drm-mp4-setmediakeys-again-after-resetting-src.html.ini
deleted file mode 100644
index 29d36baf8..000000000
--- a/testing/web-platform/meta/encrypted-media/drm-mp4-setmediakeys-again-after-resetting-src.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drm-mp4-setmediakeys-again-after-resetting-src.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/drm-mp4-setmediakeys-at-same-time.html.ini b/testing/web-platform/meta/encrypted-media/drm-mp4-setmediakeys-at-same-time.html.ini
deleted file mode 100644
index 9cf167735..000000000
--- a/testing/web-platform/meta/encrypted-media/drm-mp4-setmediakeys-at-same-time.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drm-mp4-setmediakeys-at-same-time.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/drm-mp4-setmediakeys-multiple-times-with-different-mediakeys.html.ini b/testing/web-platform/meta/encrypted-media/drm-mp4-setmediakeys-multiple-times-with-different-mediakeys.html.ini
deleted file mode 100644
index d86c6b724..000000000
--- a/testing/web-platform/meta/encrypted-media/drm-mp4-setmediakeys-multiple-times-with-different-mediakeys.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drm-mp4-setmediakeys-multiple-times-with-different-mediakeys.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/drm-mp4-setmediakeys-multiple-times-with-the-same-mediakeys.html.ini b/testing/web-platform/meta/encrypted-media/drm-mp4-setmediakeys-multiple-times-with-the-same-mediakeys.html.ini
deleted file mode 100644
index 3fabacaf4..000000000
--- a/testing/web-platform/meta/encrypted-media/drm-mp4-setmediakeys-multiple-times-with-the-same-mediakeys.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drm-mp4-setmediakeys-multiple-times-with-the-same-mediakeys.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/drm-mp4-setmediakeys-to-multiple-video-elements.html.ini b/testing/web-platform/meta/encrypted-media/drm-mp4-setmediakeys-to-multiple-video-elements.html.ini
deleted file mode 100644
index 633494d8f..000000000
--- a/testing/web-platform/meta/encrypted-media/drm-mp4-setmediakeys-to-multiple-video-elements.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drm-mp4-setmediakeys-to-multiple-video-elements.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/drm-mp4-setmediakeys.html.ini b/testing/web-platform/meta/encrypted-media/drm-mp4-setmediakeys.html.ini
deleted file mode 100644
index e257f1cd9..000000000
--- a/testing/web-platform/meta/encrypted-media/drm-mp4-setmediakeys.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drm-mp4-setmediakeys.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/drm-mp4-syntax-mediakeys.html.ini b/testing/web-platform/meta/encrypted-media/drm-mp4-syntax-mediakeys.html.ini
deleted file mode 100644
index 0675eafc6..000000000
--- a/testing/web-platform/meta/encrypted-media/drm-mp4-syntax-mediakeys.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drm-mp4-syntax-mediakeys.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/drm-mp4-syntax-mediakeysession.html.ini b/testing/web-platform/meta/encrypted-media/drm-mp4-syntax-mediakeysession.html.ini
deleted file mode 100644
index 16ae39f4c..000000000
--- a/testing/web-platform/meta/encrypted-media/drm-mp4-syntax-mediakeysession.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drm-mp4-syntax-mediakeysession.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/drm-mp4-syntax-mediakeysystemaccess.html.ini b/testing/web-platform/meta/encrypted-media/drm-mp4-syntax-mediakeysystemaccess.html.ini
deleted file mode 100644
index cad24606a..000000000
--- a/testing/web-platform/meta/encrypted-media/drm-mp4-syntax-mediakeysystemaccess.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drm-mp4-syntax-mediakeysystemaccess.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/drm-mp4-unique-origin.html.ini b/testing/web-platform/meta/encrypted-media/drm-mp4-unique-origin.html.ini
deleted file mode 100644
index 64b0f3786..000000000
--- a/testing/web-platform/meta/encrypted-media/drm-mp4-unique-origin.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drm-mp4-unique-origin.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/drm-mp4-waiting-for-a-key.html.ini b/testing/web-platform/meta/encrypted-media/drm-mp4-waiting-for-a-key.html.ini
deleted file mode 100644
index 419c62db1..000000000
--- a/testing/web-platform/meta/encrypted-media/drm-mp4-waiting-for-a-key.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drm-mp4-waiting-for-a-key.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/drm-not-callable-after-createsession.html.ini b/testing/web-platform/meta/encrypted-media/drm-not-callable-after-createsession.html.ini
deleted file mode 100644
index 667b9c035..000000000
--- a/testing/web-platform/meta/encrypted-media/drm-not-callable-after-createsession.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drm-not-callable-after-createsession.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284

diff --git a/testing/web-platform/meta/encrypted-media/drm-temporary-license-type.html.ini b/testing/web-platform/meta/encrypted-media/drm-temporary-license-type.html.ini
deleted file mode 100644
index 7a5d604dc..000000000
--- a/testing/web-platform/meta/encrypted-media/drm-temporary-license-type.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drm-temporary-license-type.html]

-  type: testharness

-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1313284