Test MediaRecorder recording a constructed MediaStream
-
+
diff --git a/dom/media/webaudio/test/mochitest.ini b/dom/media/webaudio/test/mochitest.ini
index 209c434b71ee..58da9cdc831e 100644
--- a/dom/media/webaudio/test/mochitest.ini
+++ b/dom/media/webaudio/test/mochitest.ini
@@ -32,8 +32,8 @@ support-files =
ting-48k-2ch.wav
sine-440-10s.opus
webaudio.js
- ../../tests/mochitest/mediaStreamPlayback.js
- ../../tests/mochitest/head.js
+ ../../webrtc/tests/mochitests/mediaStreamPlayback.js
+ ../../webrtc/tests/mochitests/head.js
[test_analyserNode.html]
skip-if = !asan && toolkit != android # These are tested in web-platform-tests, except on ASan and Android which don't run WPT.
diff --git a/dom/media/webaudio/test/test_mediaStreamTrackAudioSourceNodeVideo.html b/dom/media/webaudio/test/test_mediaStreamTrackAudioSourceNodeVideo.html
index dbb193155c49..b98cfc6a4fef 100644
--- a/dom/media/webaudio/test/test_mediaStreamTrackAudioSourceNodeVideo.html
+++ b/dom/media/webaudio/test/test_mediaStreamTrackAudioSourceNodeVideo.html
@@ -5,7 +5,7 @@
Test MediaStreamTrackAudioSourceNode throw video track
-
+
diff --git a/dom/media/tests/mochitest/NetworkPreparationChromeScript.js b/dom/media/webrtc/tests/mochitests/NetworkPreparationChromeScript.js
similarity index 100%
rename from dom/media/tests/mochitest/NetworkPreparationChromeScript.js
rename to dom/media/webrtc/tests/mochitests/NetworkPreparationChromeScript.js
diff --git a/dom/media/tests/mochitest/addTurnsSelfsignedCert.js b/dom/media/webrtc/tests/mochitests/addTurnsSelfsignedCert.js
similarity index 100%
rename from dom/media/tests/mochitest/addTurnsSelfsignedCert.js
rename to dom/media/webrtc/tests/mochitests/addTurnsSelfsignedCert.js
diff --git a/dom/media/tests/mochitest/blacksilence.js b/dom/media/webrtc/tests/mochitests/blacksilence.js
similarity index 100%
rename from dom/media/tests/mochitest/blacksilence.js
rename to dom/media/webrtc/tests/mochitests/blacksilence.js
diff --git a/dom/media/tests/mochitest/dataChannel.js b/dom/media/webrtc/tests/mochitests/dataChannel.js
similarity index 100%
rename from dom/media/tests/mochitest/dataChannel.js
rename to dom/media/webrtc/tests/mochitests/dataChannel.js
diff --git a/dom/media/tests/mochitest/head.js b/dom/media/webrtc/tests/mochitests/head.js
similarity index 100%
rename from dom/media/tests/mochitest/head.js
rename to dom/media/webrtc/tests/mochitests/head.js
diff --git a/dom/media/tests/mochitest/identity/identityPcTest.js b/dom/media/webrtc/tests/mochitests/identity/identityPcTest.js
similarity index 100%
rename from dom/media/tests/mochitest/identity/identityPcTest.js
rename to dom/media/webrtc/tests/mochitests/identity/identityPcTest.js
diff --git a/dom/media/tests/mochitest/identity/idp-bad.js b/dom/media/webrtc/tests/mochitests/identity/idp-bad.js
similarity index 100%
rename from dom/media/tests/mochitest/identity/idp-bad.js
rename to dom/media/webrtc/tests/mochitests/identity/idp-bad.js
diff --git a/dom/media/tests/mochitest/identity/idp-min.js b/dom/media/webrtc/tests/mochitests/identity/idp-min.js
similarity index 100%
rename from dom/media/tests/mochitest/identity/idp-min.js
rename to dom/media/webrtc/tests/mochitests/identity/idp-min.js
diff --git a/dom/media/tests/mochitest/identity/idp-redirect-http-trick.js b/dom/media/webrtc/tests/mochitests/identity/idp-redirect-http-trick.js
similarity index 100%
rename from dom/media/tests/mochitest/identity/idp-redirect-http-trick.js
rename to dom/media/webrtc/tests/mochitests/identity/idp-redirect-http-trick.js
diff --git a/dom/media/tests/mochitest/identity/idp-redirect-http-trick.js^headers^ b/dom/media/webrtc/tests/mochitests/identity/idp-redirect-http-trick.js^headers^
similarity index 100%
rename from dom/media/tests/mochitest/identity/idp-redirect-http-trick.js^headers^
rename to dom/media/webrtc/tests/mochitests/identity/idp-redirect-http-trick.js^headers^
diff --git a/dom/media/tests/mochitest/identity/idp-redirect-http.js b/dom/media/webrtc/tests/mochitests/identity/idp-redirect-http.js
similarity index 100%
rename from dom/media/tests/mochitest/identity/idp-redirect-http.js
rename to dom/media/webrtc/tests/mochitests/identity/idp-redirect-http.js
diff --git a/dom/media/tests/mochitest/identity/idp-redirect-http.js^headers^ b/dom/media/webrtc/tests/mochitests/identity/idp-redirect-http.js^headers^
similarity index 100%
rename from dom/media/tests/mochitest/identity/idp-redirect-http.js^headers^
rename to dom/media/webrtc/tests/mochitests/identity/idp-redirect-http.js^headers^
diff --git a/dom/media/tests/mochitest/identity/idp-redirect-https-double.js b/dom/media/webrtc/tests/mochitests/identity/idp-redirect-https-double.js
similarity index 100%
rename from dom/media/tests/mochitest/identity/idp-redirect-https-double.js
rename to dom/media/webrtc/tests/mochitests/identity/idp-redirect-https-double.js
diff --git a/dom/media/tests/mochitest/identity/idp-redirect-https-double.js^headers^ b/dom/media/webrtc/tests/mochitests/identity/idp-redirect-https-double.js^headers^
similarity index 100%
rename from dom/media/tests/mochitest/identity/idp-redirect-https-double.js^headers^
rename to dom/media/webrtc/tests/mochitests/identity/idp-redirect-https-double.js^headers^
diff --git a/dom/media/tests/mochitest/identity/idp-redirect-https-odd-path.js b/dom/media/webrtc/tests/mochitests/identity/idp-redirect-https-odd-path.js
similarity index 100%
rename from dom/media/tests/mochitest/identity/idp-redirect-https-odd-path.js
rename to dom/media/webrtc/tests/mochitests/identity/idp-redirect-https-odd-path.js
diff --git a/dom/media/tests/mochitest/identity/idp-redirect-https-odd-path.js^headers^ b/dom/media/webrtc/tests/mochitests/identity/idp-redirect-https-odd-path.js^headers^
similarity index 100%
rename from dom/media/tests/mochitest/identity/idp-redirect-https-odd-path.js^headers^
rename to dom/media/webrtc/tests/mochitests/identity/idp-redirect-https-odd-path.js^headers^
diff --git a/dom/media/tests/mochitest/identity/idp-redirect-https.js b/dom/media/webrtc/tests/mochitests/identity/idp-redirect-https.js
similarity index 100%
rename from dom/media/tests/mochitest/identity/idp-redirect-https.js
rename to dom/media/webrtc/tests/mochitests/identity/idp-redirect-https.js
diff --git a/dom/media/tests/mochitest/identity/idp-redirect-https.js^headers^ b/dom/media/webrtc/tests/mochitests/identity/idp-redirect-https.js^headers^
similarity index 100%
rename from dom/media/tests/mochitest/identity/idp-redirect-https.js^headers^
rename to dom/media/webrtc/tests/mochitests/identity/idp-redirect-https.js^headers^
diff --git a/dom/media/tests/mochitest/identity/idp.js b/dom/media/webrtc/tests/mochitests/identity/idp.js
similarity index 100%
rename from dom/media/tests/mochitest/identity/idp.js
rename to dom/media/webrtc/tests/mochitests/identity/idp.js
diff --git a/dom/media/tests/mochitest/identity/idp.sjs b/dom/media/webrtc/tests/mochitests/identity/idp.sjs
similarity index 100%
rename from dom/media/tests/mochitest/identity/idp.sjs
rename to dom/media/webrtc/tests/mochitests/identity/idp.sjs
diff --git a/dom/media/tests/mochitest/identity/login.html b/dom/media/webrtc/tests/mochitests/identity/login.html
similarity index 100%
rename from dom/media/tests/mochitest/identity/login.html
rename to dom/media/webrtc/tests/mochitests/identity/login.html
diff --git a/dom/media/tests/mochitest/identity/mochitest.ini b/dom/media/webrtc/tests/mochitests/identity/mochitest.ini
similarity index 75%
rename from dom/media/tests/mochitest/identity/mochitest.ini
rename to dom/media/webrtc/tests/mochitests/identity/mochitest.ini
index d8510d586b4d..0beb50561edb 100644
--- a/dom/media/tests/mochitest/identity/mochitest.ini
+++ b/dom/media/webrtc/tests/mochitests/identity/mochitest.ini
@@ -4,14 +4,14 @@ skip-if = (os == 'linux' && !debug && !e10s)
support-files =
/.well-known/idp-proxy/idp.js
identityPcTest.js
- !/dom/media/tests/mochitest/blacksilence.js
- !/dom/media/tests/mochitest/dataChannel.js
- !/dom/media/tests/mochitest/head.js
- !/dom/media/tests/mochitest/network.js
- !/dom/media/tests/mochitest/pc.js
- !/dom/media/tests/mochitest/sdpUtils.js
- !/dom/media/tests/mochitest/templates.js
- !/dom/media/tests/mochitest/turnConfig.js
+ !/dom/media/webrtc/tests/mochitests/blacksilence.js
+ !/dom/media/webrtc/tests/mochitests/dataChannel.js
+ !/dom/media/webrtc/tests/mochitests/head.js
+ !/dom/media/webrtc/tests/mochitests/network.js
+ !/dom/media/webrtc/tests/mochitests/pc.js
+ !/dom/media/webrtc/tests/mochitests/sdpUtils.js
+ !/dom/media/webrtc/tests/mochitests/templates.js
+ !/dom/media/webrtc/tests/mochitests/turnConfig.js
tags = mtg
[test_idpproxy.html]
diff --git a/dom/media/tests/mochitest/identity/test_fingerprints.html b/dom/media/webrtc/tests/mochitests/identity/test_fingerprints.html
similarity index 100%
rename from dom/media/tests/mochitest/identity/test_fingerprints.html
rename to dom/media/webrtc/tests/mochitests/identity/test_fingerprints.html
diff --git a/dom/media/tests/mochitest/identity/test_getIdentityAssertion.html b/dom/media/webrtc/tests/mochitests/identity/test_getIdentityAssertion.html
similarity index 100%
rename from dom/media/tests/mochitest/identity/test_getIdentityAssertion.html
rename to dom/media/webrtc/tests/mochitests/identity/test_getIdentityAssertion.html
diff --git a/dom/media/tests/mochitest/identity/test_idpproxy.html b/dom/media/webrtc/tests/mochitests/identity/test_idpproxy.html
similarity index 100%
rename from dom/media/tests/mochitest/identity/test_idpproxy.html
rename to dom/media/webrtc/tests/mochitests/identity/test_idpproxy.html
diff --git a/dom/media/tests/mochitest/identity/test_loginNeeded.html b/dom/media/webrtc/tests/mochitests/identity/test_loginNeeded.html
similarity index 100%
rename from dom/media/tests/mochitest/identity/test_loginNeeded.html
rename to dom/media/webrtc/tests/mochitests/identity/test_loginNeeded.html
diff --git a/dom/media/tests/mochitest/identity/test_peerConnection_asymmetricIsolation.html b/dom/media/webrtc/tests/mochitests/identity/test_peerConnection_asymmetricIsolation.html
similarity index 100%
rename from dom/media/tests/mochitest/identity/test_peerConnection_asymmetricIsolation.html
rename to dom/media/webrtc/tests/mochitests/identity/test_peerConnection_asymmetricIsolation.html
diff --git a/dom/media/tests/mochitest/identity/test_peerConnection_peerIdentity.html b/dom/media/webrtc/tests/mochitests/identity/test_peerConnection_peerIdentity.html
similarity index 100%
rename from dom/media/tests/mochitest/identity/test_peerConnection_peerIdentity.html
rename to dom/media/webrtc/tests/mochitests/identity/test_peerConnection_peerIdentity.html
diff --git a/dom/media/tests/mochitest/identity/test_setIdentityProvider.html b/dom/media/webrtc/tests/mochitests/identity/test_setIdentityProvider.html
similarity index 100%
rename from dom/media/tests/mochitest/identity/test_setIdentityProvider.html
rename to dom/media/webrtc/tests/mochitests/identity/test_setIdentityProvider.html
diff --git a/dom/media/tests/mochitest/identity/test_setIdentityProviderWithErrors.html b/dom/media/webrtc/tests/mochitests/identity/test_setIdentityProviderWithErrors.html
similarity index 100%
rename from dom/media/tests/mochitest/identity/test_setIdentityProviderWithErrors.html
rename to dom/media/webrtc/tests/mochitests/identity/test_setIdentityProviderWithErrors.html
diff --git a/dom/media/tests/mochitest/mediaStreamPlayback.js b/dom/media/webrtc/tests/mochitests/mediaStreamPlayback.js
similarity index 100%
rename from dom/media/tests/mochitest/mediaStreamPlayback.js
rename to dom/media/webrtc/tests/mochitests/mediaStreamPlayback.js
diff --git a/dom/media/tests/mochitest/mochitest.ini b/dom/media/webrtc/tests/mochitests/mochitest.ini
similarity index 100%
rename from dom/media/tests/mochitest/mochitest.ini
rename to dom/media/webrtc/tests/mochitests/mochitest.ini
diff --git a/dom/media/tests/mochitest/network.js b/dom/media/webrtc/tests/mochitests/network.js
similarity index 100%
rename from dom/media/tests/mochitest/network.js
rename to dom/media/webrtc/tests/mochitests/network.js
diff --git a/dom/media/tests/mochitest/nonTrickleIce.js b/dom/media/webrtc/tests/mochitests/nonTrickleIce.js
similarity index 100%
rename from dom/media/tests/mochitest/nonTrickleIce.js
rename to dom/media/webrtc/tests/mochitests/nonTrickleIce.js
diff --git a/dom/media/tests/mochitest/parser_rtp.js b/dom/media/webrtc/tests/mochitests/parser_rtp.js
similarity index 100%
rename from dom/media/tests/mochitest/parser_rtp.js
rename to dom/media/webrtc/tests/mochitests/parser_rtp.js
diff --git a/dom/media/tests/mochitest/pc.js b/dom/media/webrtc/tests/mochitests/pc.js
similarity index 99%
rename from dom/media/tests/mochitest/pc.js
rename to dom/media/webrtc/tests/mochitests/pc.js
index 92bf4ad07857..31c5ee7f63df 100644
--- a/dom/media/tests/mochitest/pc.js
+++ b/dom/media/webrtc/tests/mochitests/pc.js
@@ -2415,7 +2415,7 @@ function loadScript(...scripts) {
// Ensure SimpleTest.js is loaded before other scripts.
var scriptsReady = loadScript("/tests/SimpleTest/SimpleTest.js").then(() => {
return loadScript(
- "../../test/manifest.js",
+ "../../../test/manifest.js",
"head.js",
"templates.js",
"turnConfig.js",
diff --git a/dom/media/tests/mochitest/peerconnection_audio_forced_sample_rate.js b/dom/media/webrtc/tests/mochitests/peerconnection_audio_forced_sample_rate.js
similarity index 100%
rename from dom/media/tests/mochitest/peerconnection_audio_forced_sample_rate.js
rename to dom/media/webrtc/tests/mochitests/peerconnection_audio_forced_sample_rate.js
diff --git a/dom/media/tests/mochitest/sdpUtils.js b/dom/media/webrtc/tests/mochitests/sdpUtils.js
similarity index 100%
rename from dom/media/tests/mochitest/sdpUtils.js
rename to dom/media/webrtc/tests/mochitests/sdpUtils.js
diff --git a/dom/media/tests/mochitest/templates.js b/dom/media/webrtc/tests/mochitests/templates.js
similarity index 100%
rename from dom/media/tests/mochitest/templates.js
rename to dom/media/webrtc/tests/mochitests/templates.js
diff --git a/dom/media/tests/mochitest/test_1488832.html b/dom/media/webrtc/tests/mochitests/test_1488832.html
similarity index 100%
rename from dom/media/tests/mochitest/test_1488832.html
rename to dom/media/webrtc/tests/mochitests/test_1488832.html
diff --git a/dom/media/tests/mochitest/test_a_noOp.html b/dom/media/webrtc/tests/mochitests/test_a_noOp.html
similarity index 100%
rename from dom/media/tests/mochitest/test_a_noOp.html
rename to dom/media/webrtc/tests/mochitests/test_a_noOp.html
diff --git a/dom/media/tests/mochitest/test_dataChannel_basicAudio.html b/dom/media/webrtc/tests/mochitests/test_dataChannel_basicAudio.html
similarity index 100%
rename from dom/media/tests/mochitest/test_dataChannel_basicAudio.html
rename to dom/media/webrtc/tests/mochitests/test_dataChannel_basicAudio.html
diff --git a/dom/media/tests/mochitest/test_dataChannel_basicAudioVideo.html b/dom/media/webrtc/tests/mochitests/test_dataChannel_basicAudioVideo.html
similarity index 100%
rename from dom/media/tests/mochitest/test_dataChannel_basicAudioVideo.html
rename to dom/media/webrtc/tests/mochitests/test_dataChannel_basicAudioVideo.html
diff --git a/dom/media/tests/mochitest/test_dataChannel_basicAudioVideoCombined.html b/dom/media/webrtc/tests/mochitests/test_dataChannel_basicAudioVideoCombined.html
similarity index 100%
rename from dom/media/tests/mochitest/test_dataChannel_basicAudioVideoCombined.html
rename to dom/media/webrtc/tests/mochitests/test_dataChannel_basicAudioVideoCombined.html
diff --git a/dom/media/tests/mochitest/test_dataChannel_basicAudioVideoNoBundle.html b/dom/media/webrtc/tests/mochitests/test_dataChannel_basicAudioVideoNoBundle.html
similarity index 100%
rename from dom/media/tests/mochitest/test_dataChannel_basicAudioVideoNoBundle.html
rename to dom/media/webrtc/tests/mochitests/test_dataChannel_basicAudioVideoNoBundle.html
diff --git a/dom/media/tests/mochitest/test_dataChannel_basicDataOnly.html b/dom/media/webrtc/tests/mochitests/test_dataChannel_basicDataOnly.html
similarity index 100%
rename from dom/media/tests/mochitest/test_dataChannel_basicDataOnly.html
rename to dom/media/webrtc/tests/mochitests/test_dataChannel_basicDataOnly.html
diff --git a/dom/media/tests/mochitest/test_dataChannel_basicVideo.html b/dom/media/webrtc/tests/mochitests/test_dataChannel_basicVideo.html
similarity index 100%
rename from dom/media/tests/mochitest/test_dataChannel_basicVideo.html
rename to dom/media/webrtc/tests/mochitests/test_dataChannel_basicVideo.html
diff --git a/dom/media/tests/mochitest/test_dataChannel_bug1013809.html b/dom/media/webrtc/tests/mochitests/test_dataChannel_bug1013809.html
similarity index 100%
rename from dom/media/tests/mochitest/test_dataChannel_bug1013809.html
rename to dom/media/webrtc/tests/mochitests/test_dataChannel_bug1013809.html
diff --git a/dom/media/tests/mochitest/test_dataChannel_dataOnlyBufferedAmountLow.html b/dom/media/webrtc/tests/mochitests/test_dataChannel_dataOnlyBufferedAmountLow.html
similarity index 100%
rename from dom/media/tests/mochitest/test_dataChannel_dataOnlyBufferedAmountLow.html
rename to dom/media/webrtc/tests/mochitests/test_dataChannel_dataOnlyBufferedAmountLow.html
diff --git a/dom/media/tests/mochitest/test_dataChannel_dtlsVersions.html b/dom/media/webrtc/tests/mochitests/test_dataChannel_dtlsVersions.html
similarity index 100%
rename from dom/media/tests/mochitest/test_dataChannel_dtlsVersions.html
rename to dom/media/webrtc/tests/mochitests/test_dataChannel_dtlsVersions.html
diff --git a/dom/media/tests/mochitest/test_dataChannel_hostnameObfuscation.html b/dom/media/webrtc/tests/mochitests/test_dataChannel_hostnameObfuscation.html
similarity index 100%
rename from dom/media/tests/mochitest/test_dataChannel_hostnameObfuscation.html
rename to dom/media/webrtc/tests/mochitests/test_dataChannel_hostnameObfuscation.html
diff --git a/dom/media/tests/mochitest/test_dataChannel_noOffer.html b/dom/media/webrtc/tests/mochitests/test_dataChannel_noOffer.html
similarity index 100%
rename from dom/media/tests/mochitest/test_dataChannel_noOffer.html
rename to dom/media/webrtc/tests/mochitests/test_dataChannel_noOffer.html
diff --git a/dom/media/tests/mochitest/test_dataChannel_stats.html b/dom/media/webrtc/tests/mochitests/test_dataChannel_stats.html
similarity index 100%
rename from dom/media/tests/mochitest/test_dataChannel_stats.html
rename to dom/media/webrtc/tests/mochitests/test_dataChannel_stats.html
diff --git a/dom/media/tests/mochitest/test_defaultAudioConstraints.html b/dom/media/webrtc/tests/mochitests/test_defaultAudioConstraints.html
similarity index 100%
rename from dom/media/tests/mochitest/test_defaultAudioConstraints.html
rename to dom/media/webrtc/tests/mochitests/test_defaultAudioConstraints.html
diff --git a/dom/media/tests/mochitest/test_enumerateDevices.html b/dom/media/webrtc/tests/mochitests/test_enumerateDevices.html
similarity index 98%
rename from dom/media/tests/mochitest/test_enumerateDevices.html
rename to dom/media/webrtc/tests/mochitests/test_enumerateDevices.html
index 349f796c9b07..0114dca3ae96 100644
--- a/dom/media/tests/mochitest/test_enumerateDevices.html
+++ b/dom/media/webrtc/tests/mochitests/test_enumerateDevices.html
@@ -81,7 +81,7 @@ runTest(async () => {
// Check that deviceIds are stable for same origin and differ across origins.
- const path = "/tests/dom/media/tests/mochitest/test_enumerateDevices_iframe.html";
+ const path = "/tests/dom/media/webrtc/tests/mochitests/test_enumerateDevices_iframe.html";
const origins = ["https://example.com", "https://test1.example.com"];
info(window.location);
diff --git a/dom/media/tests/mochitest/test_enumerateDevices_iframe.html b/dom/media/webrtc/tests/mochitests/test_enumerateDevices_iframe.html
similarity index 100%
rename from dom/media/tests/mochitest/test_enumerateDevices_iframe.html
rename to dom/media/webrtc/tests/mochitests/test_enumerateDevices_iframe.html
diff --git a/dom/media/tests/mochitest/test_enumerateDevices_navigation.html b/dom/media/webrtc/tests/mochitests/test_enumerateDevices_navigation.html
similarity index 100%
rename from dom/media/tests/mochitest/test_enumerateDevices_navigation.html
rename to dom/media/webrtc/tests/mochitests/test_enumerateDevices_navigation.html
diff --git a/dom/media/tests/mochitest/test_fingerprinting_resistance.html b/dom/media/webrtc/tests/mochitests/test_fingerprinting_resistance.html
similarity index 100%
rename from dom/media/tests/mochitest/test_fingerprinting_resistance.html
rename to dom/media/webrtc/tests/mochitests/test_fingerprinting_resistance.html
diff --git a/dom/media/tests/mochitest/test_forceSampleRate.html b/dom/media/webrtc/tests/mochitests/test_forceSampleRate.html
similarity index 100%
rename from dom/media/tests/mochitest/test_forceSampleRate.html
rename to dom/media/webrtc/tests/mochitests/test_forceSampleRate.html
diff --git a/dom/media/tests/mochitest/test_getUserMedia_GC_MediaStream.html b/dom/media/webrtc/tests/mochitests/test_getUserMedia_GC_MediaStream.html
similarity index 100%
rename from dom/media/tests/mochitest/test_getUserMedia_GC_MediaStream.html
rename to dom/media/webrtc/tests/mochitests/test_getUserMedia_GC_MediaStream.html
diff --git a/dom/media/tests/mochitest/test_getUserMedia_active_autoplay.html b/dom/media/webrtc/tests/mochitests/test_getUserMedia_active_autoplay.html
similarity index 100%
rename from dom/media/tests/mochitest/test_getUserMedia_active_autoplay.html
rename to dom/media/webrtc/tests/mochitests/test_getUserMedia_active_autoplay.html
diff --git a/dom/media/tests/mochitest/test_getUserMedia_addTrackRemoveTrack.html b/dom/media/webrtc/tests/mochitests/test_getUserMedia_addTrackRemoveTrack.html
similarity index 100%
rename from dom/media/tests/mochitest/test_getUserMedia_addTrackRemoveTrack.html
rename to dom/media/webrtc/tests/mochitests/test_getUserMedia_addTrackRemoveTrack.html
diff --git a/dom/media/tests/mochitest/test_getUserMedia_addtrack_removetrack_events.html b/dom/media/webrtc/tests/mochitests/test_getUserMedia_addtrack_removetrack_events.html
similarity index 100%
rename from dom/media/tests/mochitest/test_getUserMedia_addtrack_removetrack_events.html
rename to dom/media/webrtc/tests/mochitests/test_getUserMedia_addtrack_removetrack_events.html
diff --git a/dom/media/tests/mochitest/test_getUserMedia_audioCapture.html b/dom/media/webrtc/tests/mochitests/test_getUserMedia_audioCapture.html
similarity index 100%
rename from dom/media/tests/mochitest/test_getUserMedia_audioCapture.html
rename to dom/media/webrtc/tests/mochitests/test_getUserMedia_audioCapture.html
diff --git a/dom/media/tests/mochitest/test_getUserMedia_audioConstraints.html b/dom/media/webrtc/tests/mochitests/test_getUserMedia_audioConstraints.html
similarity index 100%
rename from dom/media/tests/mochitest/test_getUserMedia_audioConstraints.html
rename to dom/media/webrtc/tests/mochitests/test_getUserMedia_audioConstraints.html
diff --git a/dom/media/tests/mochitest/test_getUserMedia_audioConstraints_concurrentIframes.html b/dom/media/webrtc/tests/mochitests/test_getUserMedia_audioConstraints_concurrentIframes.html
similarity index 100%
rename from dom/media/tests/mochitest/test_getUserMedia_audioConstraints_concurrentIframes.html
rename to dom/media/webrtc/tests/mochitests/test_getUserMedia_audioConstraints_concurrentIframes.html
diff --git a/dom/media/tests/mochitest/test_getUserMedia_audioConstraints_concurrentStreams.html b/dom/media/webrtc/tests/mochitests/test_getUserMedia_audioConstraints_concurrentStreams.html
similarity index 100%
rename from dom/media/tests/mochitest/test_getUserMedia_audioConstraints_concurrentStreams.html
rename to dom/media/webrtc/tests/mochitests/test_getUserMedia_audioConstraints_concurrentStreams.html
diff --git a/dom/media/tests/mochitest/test_getUserMedia_basicAudio.html b/dom/media/webrtc/tests/mochitests/test_getUserMedia_basicAudio.html
similarity index 100%
rename from dom/media/tests/mochitest/test_getUserMedia_basicAudio.html
rename to dom/media/webrtc/tests/mochitests/test_getUserMedia_basicAudio.html
diff --git a/dom/media/tests/mochitest/test_getUserMedia_basicAudio_loopback.html b/dom/media/webrtc/tests/mochitests/test_getUserMedia_basicAudio_loopback.html
similarity index 100%
rename from dom/media/tests/mochitest/test_getUserMedia_basicAudio_loopback.html
rename to dom/media/webrtc/tests/mochitests/test_getUserMedia_basicAudio_loopback.html
diff --git a/dom/media/tests/mochitest/test_getUserMedia_basicScreenshare.html b/dom/media/webrtc/tests/mochitests/test_getUserMedia_basicScreenshare.html
similarity index 100%
rename from dom/media/tests/mochitest/test_getUserMedia_basicScreenshare.html
rename to dom/media/webrtc/tests/mochitests/test_getUserMedia_basicScreenshare.html
diff --git a/dom/media/tests/mochitest/test_getUserMedia_basicTabshare.html b/dom/media/webrtc/tests/mochitests/test_getUserMedia_basicTabshare.html
similarity index 100%
rename from dom/media/tests/mochitest/test_getUserMedia_basicTabshare.html
rename to dom/media/webrtc/tests/mochitests/test_getUserMedia_basicTabshare.html
diff --git a/dom/media/tests/mochitest/test_getUserMedia_basicVideo.html b/dom/media/webrtc/tests/mochitests/test_getUserMedia_basicVideo.html
similarity index 100%
rename from dom/media/tests/mochitest/test_getUserMedia_basicVideo.html
rename to dom/media/webrtc/tests/mochitests/test_getUserMedia_basicVideo.html
diff --git a/dom/media/tests/mochitest/test_getUserMedia_basicVideoAudio.html b/dom/media/webrtc/tests/mochitests/test_getUserMedia_basicVideoAudio.html
similarity index 100%
rename from dom/media/tests/mochitest/test_getUserMedia_basicVideoAudio.html
rename to dom/media/webrtc/tests/mochitests/test_getUserMedia_basicVideoAudio.html
diff --git a/dom/media/tests/mochitest/test_getUserMedia_basicVideo_playAfterLoadedmetadata.html b/dom/media/webrtc/tests/mochitests/test_getUserMedia_basicVideo_playAfterLoadedmetadata.html
similarity index 100%
rename from dom/media/tests/mochitest/test_getUserMedia_basicVideo_playAfterLoadedmetadata.html
rename to dom/media/webrtc/tests/mochitests/test_getUserMedia_basicVideo_playAfterLoadedmetadata.html
diff --git a/dom/media/tests/mochitest/test_getUserMedia_basicWindowshare.html b/dom/media/webrtc/tests/mochitests/test_getUserMedia_basicWindowshare.html
similarity index 100%
rename from dom/media/tests/mochitest/test_getUserMedia_basicWindowshare.html
rename to dom/media/webrtc/tests/mochitests/test_getUserMedia_basicWindowshare.html
diff --git a/dom/media/tests/mochitest/test_getUserMedia_bug1223696.html b/dom/media/webrtc/tests/mochitests/test_getUserMedia_bug1223696.html
similarity index 100%
rename from dom/media/tests/mochitest/test_getUserMedia_bug1223696.html
rename to dom/media/webrtc/tests/mochitests/test_getUserMedia_bug1223696.html
diff --git a/dom/media/tests/mochitest/test_getUserMedia_callbacks.html b/dom/media/webrtc/tests/mochitests/test_getUserMedia_callbacks.html
similarity index 100%
rename from dom/media/tests/mochitest/test_getUserMedia_callbacks.html
rename to dom/media/webrtc/tests/mochitests/test_getUserMedia_callbacks.html
diff --git a/dom/media/tests/mochitest/test_getUserMedia_constraints.html b/dom/media/webrtc/tests/mochitests/test_getUserMedia_constraints.html
similarity index 100%
rename from dom/media/tests/mochitest/test_getUserMedia_constraints.html
rename to dom/media/webrtc/tests/mochitests/test_getUserMedia_constraints.html
diff --git a/dom/media/tests/mochitest/test_getUserMedia_cubebDisabled.html b/dom/media/webrtc/tests/mochitests/test_getUserMedia_cubebDisabled.html
similarity index 100%
rename from dom/media/tests/mochitest/test_getUserMedia_cubebDisabled.html
rename to dom/media/webrtc/tests/mochitests/test_getUserMedia_cubebDisabled.html
diff --git a/dom/media/tests/mochitest/test_getUserMedia_cubebDisabledFakeStreams.html b/dom/media/webrtc/tests/mochitests/test_getUserMedia_cubebDisabledFakeStreams.html
similarity index 100%
rename from dom/media/tests/mochitest/test_getUserMedia_cubebDisabledFakeStreams.html
rename to dom/media/webrtc/tests/mochitests/test_getUserMedia_cubebDisabledFakeStreams.html
diff --git a/dom/media/tests/mochitest/test_getUserMedia_getTrackById.html b/dom/media/webrtc/tests/mochitests/test_getUserMedia_getTrackById.html
similarity index 100%
rename from dom/media/tests/mochitest/test_getUserMedia_getTrackById.html
rename to dom/media/webrtc/tests/mochitests/test_getUserMedia_getTrackById.html
diff --git a/dom/media/tests/mochitest/test_getUserMedia_gumWithinGum.html b/dom/media/webrtc/tests/mochitests/test_getUserMedia_gumWithinGum.html
similarity index 100%
rename from dom/media/tests/mochitest/test_getUserMedia_gumWithinGum.html
rename to dom/media/webrtc/tests/mochitests/test_getUserMedia_gumWithinGum.html
diff --git a/dom/media/tests/mochitest/test_getUserMedia_loadedmetadata.html b/dom/media/webrtc/tests/mochitests/test_getUserMedia_loadedmetadata.html
similarity index 100%
rename from dom/media/tests/mochitest/test_getUserMedia_loadedmetadata.html
rename to dom/media/webrtc/tests/mochitests/test_getUserMedia_loadedmetadata.html
diff --git a/dom/media/tests/mochitest/test_getUserMedia_mediaElementCapture_audio.html b/dom/media/webrtc/tests/mochitests/test_getUserMedia_mediaElementCapture_audio.html
similarity index 100%
rename from dom/media/tests/mochitest/test_getUserMedia_mediaElementCapture_audio.html
rename to dom/media/webrtc/tests/mochitests/test_getUserMedia_mediaElementCapture_audio.html
diff --git a/dom/media/tests/mochitest/test_getUserMedia_mediaElementCapture_tracks.html b/dom/media/webrtc/tests/mochitests/test_getUserMedia_mediaElementCapture_tracks.html
similarity index 100%
rename from dom/media/tests/mochitest/test_getUserMedia_mediaElementCapture_tracks.html
rename to dom/media/webrtc/tests/mochitests/test_getUserMedia_mediaElementCapture_tracks.html
diff --git a/dom/media/tests/mochitest/test_getUserMedia_mediaElementCapture_video.html b/dom/media/webrtc/tests/mochitests/test_getUserMedia_mediaElementCapture_video.html
similarity index 100%
rename from dom/media/tests/mochitest/test_getUserMedia_mediaElementCapture_video.html
rename to dom/media/webrtc/tests/mochitests/test_getUserMedia_mediaElementCapture_video.html
diff --git a/dom/media/tests/mochitest/test_getUserMedia_mediaStreamClone.html b/dom/media/webrtc/tests/mochitests/test_getUserMedia_mediaStreamClone.html
similarity index 100%
rename from dom/media/tests/mochitest/test_getUserMedia_mediaStreamClone.html
rename to dom/media/webrtc/tests/mochitests/test_getUserMedia_mediaStreamClone.html
diff --git a/dom/media/tests/mochitest/test_getUserMedia_mediaStreamConstructors.html b/dom/media/webrtc/tests/mochitests/test_getUserMedia_mediaStreamConstructors.html
similarity index 100%
rename from dom/media/tests/mochitest/test_getUserMedia_mediaStreamConstructors.html
rename to dom/media/webrtc/tests/mochitests/test_getUserMedia_mediaStreamConstructors.html
diff --git a/dom/media/tests/mochitest/test_getUserMedia_mediaStreamTrackClone.html b/dom/media/webrtc/tests/mochitests/test_getUserMedia_mediaStreamTrackClone.html
similarity index 100%
rename from dom/media/tests/mochitest/test_getUserMedia_mediaStreamTrackClone.html
rename to dom/media/webrtc/tests/mochitests/test_getUserMedia_mediaStreamTrackClone.html
diff --git a/dom/media/tests/mochitest/test_getUserMedia_nonDefaultRate.html b/dom/media/webrtc/tests/mochitests/test_getUserMedia_nonDefaultRate.html
similarity index 100%
rename from dom/media/tests/mochitest/test_getUserMedia_nonDefaultRate.html
rename to dom/media/webrtc/tests/mochitests/test_getUserMedia_nonDefaultRate.html
diff --git a/dom/media/tests/mochitest/test_getUserMedia_peerIdentity.html b/dom/media/webrtc/tests/mochitests/test_getUserMedia_peerIdentity.html
similarity index 100%
rename from dom/media/tests/mochitest/test_getUserMedia_peerIdentity.html
rename to dom/media/webrtc/tests/mochitests/test_getUserMedia_peerIdentity.html
diff --git a/dom/media/tests/mochitest/test_getUserMedia_permission.html b/dom/media/webrtc/tests/mochitests/test_getUserMedia_permission.html
similarity index 96%
rename from dom/media/tests/mochitest/test_getUserMedia_permission.html
rename to dom/media/webrtc/tests/mochitests/test_getUserMedia_permission.html
index effc97b89941..29f78fdb528f 100644
--- a/dom/media/tests/mochitest/test_getUserMedia_permission.html
+++ b/dom/media/webrtc/tests/mochitests/test_getUserMedia_permission.html
@@ -28,7 +28,7 @@ async function iframeGum(dict, iframe = document.createElement("iframe")) {
};
runTest(async () => {
- const path = "/tests/dom/media/tests/mochitest/test_getUserMedia_permission_iframe.html";
+ const path = "/tests/dom/media/webrtc/tests/mochitests/test_getUserMedia_permission_iframe.html";
async function sourceFn() {
try {
diff --git a/dom/media/tests/mochitest/test_getUserMedia_permission_iframe.html b/dom/media/webrtc/tests/mochitests/test_getUserMedia_permission_iframe.html
similarity index 100%
rename from dom/media/tests/mochitest/test_getUserMedia_permission_iframe.html
rename to dom/media/webrtc/tests/mochitests/test_getUserMedia_permission_iframe.html
diff --git a/dom/media/tests/mochitest/test_getUserMedia_playAudioTwice.html b/dom/media/webrtc/tests/mochitests/test_getUserMedia_playAudioTwice.html
similarity index 100%
rename from dom/media/tests/mochitest/test_getUserMedia_playAudioTwice.html
rename to dom/media/webrtc/tests/mochitests/test_getUserMedia_playAudioTwice.html
diff --git a/dom/media/tests/mochitest/test_getUserMedia_playVideoAudioTwice.html b/dom/media/webrtc/tests/mochitests/test_getUserMedia_playVideoAudioTwice.html
similarity index 100%
rename from dom/media/tests/mochitest/test_getUserMedia_playVideoAudioTwice.html
rename to dom/media/webrtc/tests/mochitests/test_getUserMedia_playVideoAudioTwice.html
diff --git a/dom/media/tests/mochitest/test_getUserMedia_playVideoTwice.html b/dom/media/webrtc/tests/mochitests/test_getUserMedia_playVideoTwice.html
similarity index 100%
rename from dom/media/tests/mochitest/test_getUserMedia_playVideoTwice.html
rename to dom/media/webrtc/tests/mochitests/test_getUserMedia_playVideoTwice.html
diff --git a/dom/media/tests/mochitest/test_getUserMedia_scarySources.html b/dom/media/webrtc/tests/mochitests/test_getUserMedia_scarySources.html
similarity index 100%
rename from dom/media/tests/mochitest/test_getUserMedia_scarySources.html
rename to dom/media/webrtc/tests/mochitests/test_getUserMedia_scarySources.html
diff --git a/dom/media/tests/mochitest/test_getUserMedia_spinEventLoop.html b/dom/media/webrtc/tests/mochitests/test_getUserMedia_spinEventLoop.html
similarity index 100%
rename from dom/media/tests/mochitest/test_getUserMedia_spinEventLoop.html
rename to dom/media/webrtc/tests/mochitests/test_getUserMedia_spinEventLoop.html
diff --git a/dom/media/tests/mochitest/test_getUserMedia_trackCloneCleanup.html b/dom/media/webrtc/tests/mochitests/test_getUserMedia_trackCloneCleanup.html
similarity index 100%
rename from dom/media/tests/mochitest/test_getUserMedia_trackCloneCleanup.html
rename to dom/media/webrtc/tests/mochitests/test_getUserMedia_trackCloneCleanup.html
diff --git a/dom/media/tests/mochitest/test_getUserMedia_trackEnded.html b/dom/media/webrtc/tests/mochitests/test_getUserMedia_trackEnded.html
similarity index 100%
rename from dom/media/tests/mochitest/test_getUserMedia_trackEnded.html
rename to dom/media/webrtc/tests/mochitests/test_getUserMedia_trackEnded.html
diff --git a/dom/media/tests/mochitest/test_groupId.html b/dom/media/webrtc/tests/mochitests/test_groupId.html
similarity index 100%
rename from dom/media/tests/mochitest/test_groupId.html
rename to dom/media/webrtc/tests/mochitests/test_groupId.html
diff --git a/dom/media/tests/mochitest/test_ondevicechange.html b/dom/media/webrtc/tests/mochitests/test_ondevicechange.html
similarity index 100%
rename from dom/media/tests/mochitest/test_ondevicechange.html
rename to dom/media/webrtc/tests/mochitests/test_ondevicechange.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_addAudioTrackToExistingVideoStream.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_addAudioTrackToExistingVideoStream.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_addAudioTrackToExistingVideoStream.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_addAudioTrackToExistingVideoStream.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_addDataChannel.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_addDataChannel.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_addDataChannel.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_addDataChannel.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_addDataChannelNoBundle.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_addDataChannelNoBundle.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_addDataChannelNoBundle.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_addDataChannelNoBundle.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_addSecondAudioStream.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_addSecondAudioStream.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_addSecondAudioStream.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_addSecondAudioStream.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_addSecondAudioStreamNoBundle.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_addSecondAudioStreamNoBundle.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_addSecondAudioStreamNoBundle.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_addSecondAudioStreamNoBundle.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_addSecondVideoStream.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_addSecondVideoStream.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_addSecondVideoStream.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_addSecondVideoStream.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_addSecondVideoStreamNoBundle.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_addSecondVideoStreamNoBundle.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_addSecondVideoStreamNoBundle.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_addSecondVideoStreamNoBundle.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_addtrack_removetrack_events.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_addtrack_removetrack_events.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_addtrack_removetrack_events.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_addtrack_removetrack_events.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_answererAddSecondAudioStream.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_answererAddSecondAudioStream.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_answererAddSecondAudioStream.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_answererAddSecondAudioStream.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_audioCodecs.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_audioCodecs.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_audioCodecs.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_audioCodecs.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_audioContributingSources.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_audioContributingSources.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_audioContributingSources.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_audioContributingSources.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_audioRenegotiationInactiveAnswer.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_audioRenegotiationInactiveAnswer.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_audioRenegotiationInactiveAnswer.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_audioRenegotiationInactiveAnswer.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_audioSynchronizationSources.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_audioSynchronizationSources.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_audioSynchronizationSources.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_audioSynchronizationSources.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_audioSynchronizationSourcesUnidirectional.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_audioSynchronizationSourcesUnidirectional.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_audioSynchronizationSourcesUnidirectional.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_audioSynchronizationSourcesUnidirectional.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_basicAudio.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_basicAudio.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_basicAudio.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_basicAudio.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_basicAudioDynamicPtMissingRtpmap.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_basicAudioDynamicPtMissingRtpmap.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_basicAudioDynamicPtMissingRtpmap.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_basicAudioDynamicPtMissingRtpmap.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_basicAudioNATRelay.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_basicAudioNATRelay.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_basicAudioNATRelay.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_basicAudioNATRelay.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_basicAudioNATRelayTCP.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_basicAudioNATRelayTCP.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_basicAudioNATRelayTCP.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_basicAudioNATRelayTCP.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_basicAudioNATRelayTLS.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_basicAudioNATRelayTLS.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_basicAudioNATRelayTLS.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_basicAudioNATRelayTLS.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_basicAudioNATSrflx.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_basicAudioNATSrflx.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_basicAudioNATSrflx.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_basicAudioNATSrflx.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_basicAudioPcmaPcmuOnly.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_basicAudioPcmaPcmuOnly.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_basicAudioPcmaPcmuOnly.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_basicAudioPcmaPcmuOnly.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_basicAudioRequireEOC.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_basicAudioRequireEOC.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_basicAudioRequireEOC.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_basicAudioRequireEOC.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_basicAudioVerifyRtpHeaderExtensions.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_basicAudioVerifyRtpHeaderExtensions.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_basicAudioVerifyRtpHeaderExtensions.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_basicAudioVerifyRtpHeaderExtensions.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_basicAudioVideo.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_basicAudioVideo.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_basicAudioVideo.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_basicAudioVideo.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_basicAudioVideoCombined.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_basicAudioVideoCombined.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_basicAudioVideoCombined.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_basicAudioVideoCombined.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_basicAudioVideoNoBundle.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_basicAudioVideoNoBundle.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_basicAudioVideoNoBundle.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_basicAudioVideoNoBundle.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_basicAudioVideoNoBundleNoRtcpMux.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_basicAudioVideoNoBundleNoRtcpMux.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_basicAudioVideoNoBundleNoRtcpMux.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_basicAudioVideoNoBundleNoRtcpMux.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_basicAudioVideoNoRtcpMux.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_basicAudioVideoNoRtcpMux.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_basicAudioVideoNoRtcpMux.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_basicAudioVideoNoRtcpMux.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_basicAudioVideoTransceivers.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_basicAudioVideoTransceivers.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_basicAudioVideoTransceivers.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_basicAudioVideoTransceivers.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_basicAudioVideoVerifyExtmap.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_basicAudioVideoVerifyExtmap.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_basicAudioVideoVerifyExtmap.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_basicAudioVideoVerifyExtmap.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_basicAudioVideoVerifyExtmapSendonly.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_basicAudioVideoVerifyExtmapSendonly.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_basicAudioVideoVerifyExtmapSendonly.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_basicAudioVideoVerifyExtmapSendonly.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_basicAudioVideoVerifyTooLongMidFails.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_basicAudioVideoVerifyTooLongMidFails.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_basicAudioVideoVerifyTooLongMidFails.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_basicAudioVideoVerifyTooLongMidFails.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_basicAudio_forced_higher_rate.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_basicAudio_forced_higher_rate.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_basicAudio_forced_higher_rate.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_basicAudio_forced_higher_rate.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_basicAudio_forced_lower_rate.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_basicAudio_forced_lower_rate.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_basicAudio_forced_lower_rate.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_basicAudio_forced_lower_rate.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_basicH264Video.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_basicH264Video.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_basicH264Video.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_basicH264Video.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_basicScreenshare.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_basicScreenshare.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_basicScreenshare.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_basicScreenshare.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_basicVideo.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_basicVideo.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_basicVideo.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_basicVideo.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_basicVideoVerifyRtpHeaderExtensions.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_basicVideoVerifyRtpHeaderExtensions.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_basicVideoVerifyRtpHeaderExtensions.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_basicVideoVerifyRtpHeaderExtensions.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_basicWindowshare.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_basicWindowshare.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_basicWindowshare.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_basicWindowshare.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_bug1013809.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_bug1013809.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_bug1013809.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_bug1013809.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_bug1042791.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_bug1042791.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_bug1042791.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_bug1042791.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_bug1227781.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_bug1227781.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_bug1227781.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_bug1227781.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_bug1512281.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_bug1512281.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_bug1512281.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_bug1512281.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_bug822674.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_bug822674.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_bug822674.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_bug822674.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_bug825703.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_bug825703.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_bug825703.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_bug825703.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_bug827843.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_bug827843.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_bug827843.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_bug827843.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_bug834153.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_bug834153.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_bug834153.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_bug834153.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_callbacks.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_callbacks.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_callbacks.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_callbacks.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_captureStream_canvas_2d.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_captureStream_canvas_2d.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_captureStream_canvas_2d.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_captureStream_canvas_2d.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_captureStream_canvas_2d_noSSRC.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_captureStream_canvas_2d_noSSRC.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_captureStream_canvas_2d_noSSRC.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_captureStream_canvas_2d_noSSRC.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_captureStream_canvas_webgl.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_captureStream_canvas_webgl.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_captureStream_canvas_webgl.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_captureStream_canvas_webgl.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_capturedVideo.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_capturedVideo.html
similarity index 98%
rename from dom/media/tests/mochitest/test_peerConnection_capturedVideo.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_capturedVideo.html
index 7fb1a9131470..25db23ef9952 100644
--- a/dom/media/tests/mochitest/test_peerConnection_capturedVideo.html
+++ b/dom/media/webrtc/tests/mochitests/test_peerConnection_capturedVideo.html
@@ -38,7 +38,7 @@ function startTest(media, token) {
video.muted = true;
video.controls = true;
video.preload = "metadata";
- video.src = "../../test/" + media.name;
+ video.src = "../../../test/" + media.name;
document.getElementById("content").appendChild(video);
diff --git a/dom/media/tests/mochitest/test_peerConnection_certificates.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_certificates.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_certificates.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_certificates.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_checkPacketDumpHook.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_checkPacketDumpHook.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_checkPacketDumpHook.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_checkPacketDumpHook.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_close.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_close.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_close.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_close.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_closeDuringIce.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_closeDuringIce.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_closeDuringIce.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_closeDuringIce.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_constructedStream.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_constructedStream.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_constructedStream.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_constructedStream.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_disabledVideoPreNegotiation.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_disabledVideoPreNegotiation.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_disabledVideoPreNegotiation.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_disabledVideoPreNegotiation.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_errorCallbacks.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_errorCallbacks.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_errorCallbacks.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_errorCallbacks.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_forwarding_basicAudioVideoCombined.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_forwarding_basicAudioVideoCombined.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_forwarding_basicAudioVideoCombined.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_forwarding_basicAudioVideoCombined.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_iceFailure.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_iceFailure.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_iceFailure.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_iceFailure.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_insertDTMF.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_insertDTMF.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_insertDTMF.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_insertDTMF.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_localReofferRollback.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_localReofferRollback.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_localReofferRollback.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_localReofferRollback.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_localRollback.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_localRollback.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_localRollback.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_localRollback.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_maxFsConstraint.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_maxFsConstraint.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_maxFsConstraint.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_maxFsConstraint.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_multiple_captureStream_canvas_2d.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_multiple_captureStream_canvas_2d.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_multiple_captureStream_canvas_2d.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_multiple_captureStream_canvas_2d.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_noTrickleAnswer.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_noTrickleAnswer.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_noTrickleAnswer.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_noTrickleAnswer.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_noTrickleOffer.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_noTrickleOffer.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_noTrickleOffer.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_noTrickleOffer.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_noTrickleOfferAnswer.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_noTrickleOfferAnswer.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_noTrickleOfferAnswer.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_noTrickleOfferAnswer.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_nonDefaultRate.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_nonDefaultRate.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_nonDefaultRate.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_nonDefaultRate.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_offerRequiresReceiveAudio.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_offerRequiresReceiveAudio.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_offerRequiresReceiveAudio.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_offerRequiresReceiveAudio.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_offerRequiresReceiveVideo.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_offerRequiresReceiveVideo.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_offerRequiresReceiveVideo.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_offerRequiresReceiveVideo.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_offerRequiresReceiveVideoAudio.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_offerRequiresReceiveVideoAudio.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_offerRequiresReceiveVideoAudio.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_offerRequiresReceiveVideoAudio.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_promiseSendOnly.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_promiseSendOnly.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_promiseSendOnly.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_promiseSendOnly.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_recordReceiveTrack.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_recordReceiveTrack.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_recordReceiveTrack.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_recordReceiveTrack.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_relayOnly.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_relayOnly.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_relayOnly.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_relayOnly.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_remoteReofferRollback.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_remoteReofferRollback.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_remoteReofferRollback.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_remoteReofferRollback.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_remoteRollback.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_remoteRollback.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_remoteRollback.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_remoteRollback.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_removeAudioTrack.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_removeAudioTrack.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_removeAudioTrack.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_removeAudioTrack.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_removeThenAddAudioTrack.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_removeThenAddAudioTrack.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_removeThenAddAudioTrack.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_removeThenAddAudioTrack.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_removeThenAddAudioTrackNoBundle.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_removeThenAddAudioTrackNoBundle.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_removeThenAddAudioTrackNoBundle.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_removeThenAddAudioTrackNoBundle.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_removeThenAddVideoTrack.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_removeThenAddVideoTrack.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_removeThenAddVideoTrack.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_removeThenAddVideoTrack.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_removeThenAddVideoTrackNoBundle.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_removeThenAddVideoTrackNoBundle.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_removeThenAddVideoTrackNoBundle.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_removeThenAddVideoTrackNoBundle.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_removeVideoTrack.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_removeVideoTrack.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_removeVideoTrack.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_removeVideoTrack.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_renderAfterRenegotiation.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_renderAfterRenegotiation.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_renderAfterRenegotiation.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_renderAfterRenegotiation.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_replaceTrack.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_replaceTrack.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_replaceTrack.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_replaceTrack.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_replaceTrack_disabled.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_replaceTrack_disabled.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_replaceTrack_disabled.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_replaceTrack_disabled.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_replaceVideoThenRenegotiate.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_replaceVideoThenRenegotiate.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_replaceVideoThenRenegotiate.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_replaceVideoThenRenegotiate.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_restartIce.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_restartIce.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_restartIce.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_restartIce.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_restartIceBadAnswer.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_restartIceBadAnswer.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_restartIceBadAnswer.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_restartIceBadAnswer.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_restartIceLocalAndRemoteRollback.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_restartIceLocalAndRemoteRollback.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_restartIceLocalAndRemoteRollback.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_restartIceLocalAndRemoteRollback.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_restartIceLocalAndRemoteRollbackNoSubsequentRestart.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_restartIceLocalAndRemoteRollbackNoSubsequentRestart.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_restartIceLocalAndRemoteRollbackNoSubsequentRestart.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_restartIceLocalAndRemoteRollbackNoSubsequentRestart.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_restartIceLocalRollback.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_restartIceLocalRollback.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_restartIceLocalRollback.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_restartIceLocalRollback.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_restartIceLocalRollbackNoSubsequentRestart.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_restartIceLocalRollbackNoSubsequentRestart.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_restartIceLocalRollbackNoSubsequentRestart.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_restartIceLocalRollbackNoSubsequentRestart.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_restartIceNoBundle.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_restartIceNoBundle.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_restartIceNoBundle.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_restartIceNoBundle.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_restartIceNoBundleNoRtcpMux.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_restartIceNoBundleNoRtcpMux.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_restartIceNoBundleNoRtcpMux.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_restartIceNoBundleNoRtcpMux.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_restartIceNoRtcpMux.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_restartIceNoRtcpMux.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_restartIceNoRtcpMux.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_restartIceNoRtcpMux.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_restrictBandwidthTargetBitrate.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_restrictBandwidthTargetBitrate.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_restrictBandwidthTargetBitrate.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_restrictBandwidthTargetBitrate.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_restrictBandwidthWithTias.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_restrictBandwidthWithTias.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_restrictBandwidthWithTias.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_restrictBandwidthWithTias.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_rtcp_rsize.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_rtcp_rsize.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_rtcp_rsize.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_rtcp_rsize.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_scaleResolution.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_scaleResolution.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_scaleResolution.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_scaleResolution.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_sender_and_receiver_stats.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_sender_and_receiver_stats.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_sender_and_receiver_stats.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_sender_and_receiver_stats.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_setLocalAnswerInHaveLocalOffer.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_setLocalAnswerInHaveLocalOffer.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_setLocalAnswerInHaveLocalOffer.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_setLocalAnswerInHaveLocalOffer.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_setLocalAnswerInStable.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_setLocalAnswerInStable.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_setLocalAnswerInStable.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_setLocalAnswerInStable.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_setLocalOfferInHaveRemoteOffer.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_setLocalOfferInHaveRemoteOffer.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_setLocalOfferInHaveRemoteOffer.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_setLocalOfferInHaveRemoteOffer.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_setParameters.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_setParameters.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_setParameters.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_setParameters.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_setParameters_scaleResolutionDownBy.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_setParameters_scaleResolutionDownBy.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_setParameters_scaleResolutionDownBy.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_setParameters_scaleResolutionDownBy.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_setRemoteAnswerInHaveRemoteOffer.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_setRemoteAnswerInHaveRemoteOffer.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_setRemoteAnswerInHaveRemoteOffer.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_setRemoteAnswerInHaveRemoteOffer.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_setRemoteAnswerInStable.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_setRemoteAnswerInStable.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_setRemoteAnswerInStable.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_setRemoteAnswerInStable.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_setRemoteOfferInHaveLocalOffer.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_setRemoteOfferInHaveLocalOffer.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_setRemoteOfferInHaveLocalOffer.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_setRemoteOfferInHaveLocalOffer.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_simulcastAnswer.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_simulcastAnswer.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_simulcastAnswer.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_simulcastAnswer.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_simulcastAnswer_lowResFirst.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_simulcastAnswer_lowResFirst.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_simulcastAnswer_lowResFirst.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_simulcastAnswer_lowResFirst.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_simulcastOddResolution.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_simulcastOddResolution.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_simulcastOddResolution.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_simulcastOddResolution.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_simulcastOffer.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_simulcastOffer.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_simulcastOffer.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_simulcastOffer.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_simulcastOffer_lowResFirst.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_simulcastOffer_lowResFirst.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_simulcastOffer_lowResFirst.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_simulcastOffer_lowResFirst.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_stats.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_stats.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_stats.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_stats.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_stats_relayProtocol.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_stats_relayProtocol.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_stats_relayProtocol.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_stats_relayProtocol.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_syncSetDescription.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_syncSetDescription.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_syncSetDescription.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_syncSetDescription.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_telephoneEventFirst.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_telephoneEventFirst.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_telephoneEventFirst.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_telephoneEventFirst.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_threeUnbundledConnections.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_threeUnbundledConnections.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_threeUnbundledConnections.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_threeUnbundledConnections.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_throwInCallbacks.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_throwInCallbacks.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_throwInCallbacks.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_throwInCallbacks.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_toJSON.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_toJSON.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_toJSON.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_toJSON.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_trackDisabling.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_trackDisabling.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_trackDisabling.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_trackDisabling.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_trackDisabling_clones.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_trackDisabling_clones.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_trackDisabling_clones.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_trackDisabling_clones.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_trackless_sender_stats.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_trackless_sender_stats.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_trackless_sender_stats.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_trackless_sender_stats.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_twoAudioStreams.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_twoAudioStreams.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_twoAudioStreams.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_twoAudioStreams.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_twoAudioTracksInOneStream.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_twoAudioTracksInOneStream.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_twoAudioTracksInOneStream.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_twoAudioTracksInOneStream.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_twoAudioVideoStreams.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_twoAudioVideoStreams.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_twoAudioVideoStreams.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_twoAudioVideoStreams.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_twoAudioVideoStreamsCombined.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_twoAudioVideoStreamsCombined.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_twoAudioVideoStreamsCombined.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_twoAudioVideoStreamsCombined.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_twoVideoStreams.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_twoVideoStreams.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_twoVideoStreams.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_twoVideoStreams.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_twoVideoTracksInOneStream.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_twoVideoTracksInOneStream.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_twoVideoTracksInOneStream.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_twoVideoTracksInOneStream.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_verifyAudioAfterRenegotiation.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_verifyAudioAfterRenegotiation.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_verifyAudioAfterRenegotiation.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_verifyAudioAfterRenegotiation.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_verifyDescriptions.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_verifyDescriptions.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_verifyDescriptions.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_verifyDescriptions.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_verifyVideoAfterRenegotiation.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_verifyVideoAfterRenegotiation.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_verifyVideoAfterRenegotiation.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_verifyVideoAfterRenegotiation.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_videoCodecs.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_videoCodecs.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_videoCodecs.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_videoCodecs.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_videoRenegotiationInactiveAnswer.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_videoRenegotiationInactiveAnswer.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_videoRenegotiationInactiveAnswer.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_videoRenegotiationInactiveAnswer.html
diff --git a/dom/media/tests/mochitest/test_peerConnection_webAudio.html b/dom/media/webrtc/tests/mochitests/test_peerConnection_webAudio.html
similarity index 100%
rename from dom/media/tests/mochitest/test_peerConnection_webAudio.html
rename to dom/media/webrtc/tests/mochitests/test_peerConnection_webAudio.html
diff --git a/dom/media/tests/mochitest/test_selftest.html b/dom/media/webrtc/tests/mochitests/test_selftest.html
similarity index 100%
rename from dom/media/tests/mochitest/test_selftest.html
rename to dom/media/webrtc/tests/mochitests/test_selftest.html
diff --git a/dom/media/tests/mochitest/test_setSinkId.html b/dom/media/webrtc/tests/mochitests/test_setSinkId.html
similarity index 100%
rename from dom/media/tests/mochitest/test_setSinkId.html
rename to dom/media/webrtc/tests/mochitests/test_setSinkId.html
diff --git a/dom/media/tests/mochitest/test_setSinkId_default_addTrack.html b/dom/media/webrtc/tests/mochitests/test_setSinkId_default_addTrack.html
similarity index 100%
rename from dom/media/tests/mochitest/test_setSinkId_default_addTrack.html
rename to dom/media/webrtc/tests/mochitests/test_setSinkId_default_addTrack.html
diff --git a/dom/media/tests/mochitest/test_setSinkId_preMutedElement.html b/dom/media/webrtc/tests/mochitests/test_setSinkId_preMutedElement.html
similarity index 100%
rename from dom/media/tests/mochitest/test_setSinkId_preMutedElement.html
rename to dom/media/webrtc/tests/mochitests/test_setSinkId_preMutedElement.html
diff --git a/dom/media/tests/mochitest/turnConfig.js b/dom/media/webrtc/tests/mochitests/turnConfig.js
similarity index 100%
rename from dom/media/tests/mochitest/turnConfig.js
rename to dom/media/webrtc/tests/mochitests/turnConfig.js
diff --git a/taskcluster/test/data/bugbug-push-schedules.json b/taskcluster/test/data/bugbug-push-schedules.json
index 8522eddeccee..9a002c954361 100644
--- a/taskcluster/test/data/bugbug-push-schedules.json
+++ b/taskcluster/test/data/bugbug-push-schedules.json
@@ -612,7 +612,12 @@
"test-windows10-64/opt-*-spi-e10s",
"test-linux1804-64/opt-*-spi-e10s"
],
- "dom/media/tests/mochitest/mochitest.ini": [
+ "dom/media/webaudio/test/mochitest.ini": [
+ "test-windows10-64/opt-*-e10s",
+ "test-windows10-64-qr/debug-*-spi-e10s",
+ "test-windows10-64-qr/opt-*-spi-e10s"
+ ],
+ "dom/media/webrtc/tests/mochitests/mochitest.ini": [
"test-linux1804-64/debug-*-e10s",
"test-linux1804-64-qr/debug-*-fis-e10s",
"test-windows10-64/debug-*-e10s",
@@ -624,11 +629,6 @@
"test-android-hw-p2-8-0-android-aarch64/debug-geckoview-*-spi-e10s",
"test-windows7-32/debug-*-e10s"
],
- "dom/media/webaudio/test/mochitest.ini": [
- "test-windows10-64/opt-*-e10s",
- "test-windows10-64-qr/debug-*-spi-e10s",
- "test-windows10-64-qr/opt-*-spi-e10s"
- ],
"dom/media/webvtt/tests/xpcshell.ini": [
"test-linux1804-64-qr/opt-*-e10s"
],
@@ -2273,8 +2273,8 @@
"dom/media/mediasource/test/mochitest.ini": 0.82,
"dom/media/test/crashtests/crashtests.list": 0.57,
"dom/media/test/mochitest.ini": 0.95,
- "dom/media/tests/mochitest/mochitest.ini": 0.98,
"dom/media/webaudio/test/mochitest.ini": 0.61,
+ "dom/media/webrtc/tests/mochitests/mochitest.ini": 0.98,
"dom/media/webvtt/tests/xpcshell.ini": 0.8,
"dom/network/tests/chrome.ini": 0.57,
"dom/performance/tests/mochitest.ini": 0.67,
diff --git a/testing/runtimes/manifest-runtimes-android.json b/testing/runtimes/manifest-runtimes-android.json
index a3d07295d6fe..f44ed22d8d26 100644
--- a/testing/runtimes/manifest-runtimes-android.json
+++ b/testing/runtimes/manifest-runtimes-android.json
@@ -68,10 +68,10 @@
"dom/media/mediasession/test/mochitest.ini": 5.24,
"dom/media/mediasource/test/mochitest.ini": 44.09,
"dom/media/test/mochitest.ini": 661.4,
- "dom/media/tests/mochitest/identity/mochitest.ini": 6.98,
- "dom/media/tests/mochitest/mochitest.ini": 313.02,
"dom/media/webaudio/test/blink/mochitest.ini": 2.56,
"dom/media/webaudio/test/mochitest.ini": 112.74,
+ "dom/media/webrtc/tests/mochitests/identity/mochitest.ini": 6.98,
+ "dom/media/webrtc/tests/mochitests/mochitest.ini": 313.02,
"dom/media/webspeech/recognition/test/mochitest.ini": 32.99,
"dom/media/webspeech/synth/test/mochitest.ini": 5.45,
"dom/media/webspeech/synth/test/startup/mochitest.ini": 1.22
diff --git a/testing/runtimes/manifest-runtimes-unix.json b/testing/runtimes/manifest-runtimes-unix.json
index f7571950af05..c8ff02cf3d4f 100644
--- a/testing/runtimes/manifest-runtimes-unix.json
+++ b/testing/runtimes/manifest-runtimes-unix.json
@@ -467,10 +467,10 @@
"dom/media/mediasession/test/mochitest.ini": 12.29,
"dom/media/mediasource/test/mochitest.ini": 179.03,
"dom/media/test/mochitest.ini": 1466.05,
- "dom/media/tests/mochitest/identity/mochitest.ini": 26.38,
- "dom/media/tests/mochitest/mochitest.ini": 723.27,
"dom/media/webaudio/test/blink/mochitest.ini": 3.24,
"dom/media/webaudio/test/mochitest.ini": 285.46,
+ "dom/media/webrtc/tests/mochitests/identity/mochitest.ini": 26.38,
+ "dom/media/webrtc/tests/mochitests/mochitest.ini": 723.27,
"dom/media/webspeech/recognition/test/mochitest.ini": 50.98,
"dom/media/webspeech/synth/test/mochitest.ini": 5.86,
"dom/media/webspeech/synth/test/startup/mochitest.ini": 1.23
diff --git a/testing/runtimes/manifest-runtimes-windows.json b/testing/runtimes/manifest-runtimes-windows.json
index f2e983648bb1..3f71ff701092 100644
--- a/testing/runtimes/manifest-runtimes-windows.json
+++ b/testing/runtimes/manifest-runtimes-windows.json
@@ -462,10 +462,10 @@
"dom/media/mediasession/test/mochitest.ini": 5.08,
"dom/media/mediasource/test/mochitest.ini": 134.74,
"dom/media/test/mochitest.ini": 966.42,
- "dom/media/tests/mochitest/identity/mochitest.ini": 11.66,
- "dom/media/tests/mochitest/mochitest.ini": 412.53,
"dom/media/webaudio/test/blink/mochitest.ini": 2.35,
"dom/media/webaudio/test/mochitest.ini": 110.28,
+ "dom/media/webrtc/tests/mochitests/identity/mochitest.ini": 11.66,
+ "dom/media/webrtc/tests/mochitests/mochitest.ini": 412.53,
"dom/media/webspeech/recognition/test/mochitest.ini": 32.74,
"dom/media/webspeech/synth/test/mochitest.ini": 4.86,
"dom/media/webspeech/synth/test/startup/mochitest.ini": 1.18