Bug 1159756. Stop forcing the media.mediasource.enabled preference to true and the media.mediasource.whitelist preference to false in the test harness. r=kinetik
authorBoris Zbarsky <bzbarsky@mit.edu>
Thu, 30 Apr 2015 14:25:03 -0400
changeset 273251 fe44cfb27e75ac966193b7128024d0939a676af3
parent 273159 7723b15ea695e321e6acda04beef9bc98728dd13
child 273252 4d85a02e9c286a64c47d21e8f1f12d7fbbeb4c5e
push id863
push userraliiev@mozilla.com
push dateMon, 03 Aug 2015 13:22:43 +0000
treeherdermozilla-release@f6321b14228d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskinetik
bugs1159756
milestone40.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1159756. Stop forcing the media.mediasource.enabled preference to true and the media.mediasource.whitelist preference to false in the test harness. r=kinetik
dom/media/mediasource/test/mediasource.js
dom/media/mediasource/test/test_MediaSource_disabled.html
dom/media/test/eme.js
dom/media/test/test_VideoPlaybackQuality.html
dom/media/test/test_VideoPlaybackQuality_disabled.html
dom/tests/mochitest/general/test_interfaces.html
testing/profiles/prefs_general.js
testing/web-platform/meta/media-source/SourceBuffer-abort-readyState.html.ini
testing/web-platform/meta/media-source/SourceBuffer-abort-removed.html.ini
testing/web-platform/meta/media-source/SourceBuffer-abort-updating.html.ini
testing/web-platform/meta/media-source/SourceBuffer-abort.html.ini
testing/web-platform/meta/media-source/URL-createObjectURL-revoke.html.ini
testing/web-platform/meta/media-source/URL-createObjectURL.html.ini
testing/web-platform/meta/media-source/interfaces.html.ini
testing/web-platform/meta/media-source/mediasource-addsourcebuffer.html.ini
testing/web-platform/meta/media-source/mediasource-append-buffer.html.ini
testing/web-platform/meta/media-source/mediasource-appendwindow.html.ini
testing/web-platform/meta/media-source/mediasource-buffered.html.ini
testing/web-platform/meta/media-source/mediasource-closed.html.ini
testing/web-platform/meta/media-source/mediasource-config-change-mp4-a-bitrate.html.ini
testing/web-platform/meta/media-source/mediasource-config-change-mp4-av-audio-bitrate.html.ini
testing/web-platform/meta/media-source/mediasource-config-change-mp4-av-framesize.html.ini
testing/web-platform/meta/media-source/mediasource-config-change-mp4-av-video-bitrate.html.ini
testing/web-platform/meta/media-source/mediasource-config-change-mp4-v-bitrate.html.ini
testing/web-platform/meta/media-source/mediasource-config-change-mp4-v-framerate.html.ini
testing/web-platform/meta/media-source/mediasource-config-change-mp4-v-framesize.html.ini
testing/web-platform/meta/media-source/mediasource-config-change-webm-a-bitrate.html.ini
testing/web-platform/meta/media-source/mediasource-config-change-webm-av-audio-bitrate.html.ini
testing/web-platform/meta/media-source/mediasource-config-change-webm-av-framesize.html.ini
testing/web-platform/meta/media-source/mediasource-config-change-webm-av-video-bitrate.html.ini
testing/web-platform/meta/media-source/mediasource-config-change-webm-v-bitrate.html.ini
testing/web-platform/meta/media-source/mediasource-config-change-webm-v-framerate.html.ini
testing/web-platform/meta/media-source/mediasource-config-change-webm-v-framesize.html.ini
testing/web-platform/meta/media-source/mediasource-duration-boundaryconditions.html.ini
testing/web-platform/meta/media-source/mediasource-duration.html.ini
testing/web-platform/meta/media-source/mediasource-endofstream-invaliderror.html.ini
testing/web-platform/meta/media-source/mediasource-getvideoplaybackquality.html.ini
testing/web-platform/meta/media-source/mediasource-is-type-supported.html.ini
testing/web-platform/meta/media-source/mediasource-multiple-attach.html.ini
testing/web-platform/meta/media-source/mediasource-play-then-seek-back.html.ini
testing/web-platform/meta/media-source/mediasource-play.html.ini
testing/web-platform/meta/media-source/mediasource-redundant-seek.html.ini
testing/web-platform/meta/media-source/mediasource-remove.html.ini
testing/web-platform/meta/media-source/mediasource-removesourcebuffer.html.ini
testing/web-platform/meta/media-source/mediasource-seek-beyond-duration.html.ini
testing/web-platform/meta/media-source/mediasource-seek-during-pending-seek.html.ini
testing/web-platform/meta/media-source/mediasource-sequencemode-append-buffer.html.ini
testing/web-platform/meta/media-source/mediasource-sourcebuffer-mode.html.ini
testing/web-platform/meta/media-source/mediasource-sourcebufferlist.html.ini
testing/web-platform/meta/media-source/mediasource-timestamp-offset.html.ini
--- a/dom/media/mediasource/test/mediasource.js
+++ b/dom/media/mediasource/test/mediasource.js
@@ -11,17 +11,23 @@ function runWithMSE(testFunction) {
     document.body.appendChild(el);
     SimpleTest.registerCleanupFunction(function () {
       el.parentNode.removeChild(el);
     });
 
     testFunction(ms, el);
   }
 
-  addLoadEvent(bootstrapTest);
+  addLoadEvent(function () {
+    SpecialPowers.pushPrefEnv({"set": [
+      [ "media.mediasource.enabled", true ],
+      [ "media.mediasource.whitelist", false ],
+    ]},
+                              bootstrapTest);
+  });
 }
 
 function fetchWithXHR(uri, onLoadFunction) {
   var p = new Promise(function(resolve, reject) {
     var xhr = new XMLHttpRequest();
     xhr.open("GET", uri, true);
     xhr.responseType = "arraybuffer";
     xhr.addEventListener("load", function () {
--- a/dom/media/mediasource/test/test_MediaSource_disabled.html
+++ b/dom/media/mediasource/test/test_MediaSource_disabled.html
@@ -17,16 +17,17 @@ function test() {
   SimpleTest.doesThrow(() => new MediaSource,
                        "MediaSource should be hidden behind a pref");
   SimpleTest.finish();
 }
 
 SpecialPowers.pushPrefEnv({"set":
     [
       ["media.mediasource.enabled", false],
+      ["media.mediasource.whitelist", false],
     ]
   },
                           test);
 
 </script>
 </pre>
 </body>
 </html>
--- a/dom/media/test/eme.js
+++ b/dom/media/test/eme.js
@@ -382,21 +382,23 @@ function SetupEME(test, token, params)
       }
     }
   });
   return v;
 }
 
 function SetupEMEPref(callback) {
   var prefs = [
+    [ "media.mediasource.enabled", true ],
+    [ "media.mediasource.whitelist", false ],
     [ "media.fragmented-mp4.exposed", true ],
   ];
 
   if (/Linux/.test(navigator.userAgent)) {
     prefs.push([ "media.fragmented-mp4.ffmpeg.enabled", true ]);
   } else if (SpecialPowers.Services.appinfo.name == "B2G" ||
              !document.createElement('video').canPlayType("video/mp4")) {
    // XXX remove once we have mp4 PlatformDecoderModules on all platforms.
    prefs.push([ "media.fragmented-mp4.use-blank-decoder", true ]);
   }
 
   SpecialPowers.pushPrefEnv({ "set" : prefs }, callback);
-}
\ No newline at end of file
+}
--- a/dom/media/test/test_VideoPlaybackQuality.html
+++ b/dom/media/test/test_VideoPlaybackQuality.html
@@ -45,13 +45,20 @@ function test() {
       is(vpq.droppedVideoFrames, 0, "droppedVideoFrames should be 0");
       is(vpq.corruptedVideoFrames, 0, "corruptedVideoFrames should be 0");
 
       SimpleTest.finish();
     });
   });
 }
 
-addLoadEvent(test);
+addLoadEvent(function() {
+  SpecialPowers.pushPrefEnv({"set":
+    [
+      ["media.mediasource.enabled", true],
+      ["media.mediasource.whitelist", false],
+    ]
+  }, test);
+});
 </script>
 </pre>
 </body>
 </html>
--- a/dom/media/test/test_VideoPlaybackQuality_disabled.html
+++ b/dom/media/test/test_VideoPlaybackQuality_disabled.html
@@ -23,15 +23,16 @@ function test() {
   ok(accessThrows, "getVideoPlaybackQuality should be hidden behind a pref");
   SimpleTest.finish();
 }
 
 addLoadEvent(function() {
   SpecialPowers.pushPrefEnv({"set":
     [
      ["media.mediasource.enabled", false],
+     ["media.mediasource.whitelist", false],
     ]
   }, test);
 });
 </script>
 </pre>
 </body>
 </html>
--- a/dom/tests/mochitest/general/test_interfaces.html
+++ b/dom/tests/mochitest/general/test_interfaces.html
@@ -680,17 +680,17 @@ var interfaceNamesInGlobalScope =
     {name: "MediaKeyStatusMap", pref: "media.eme.apiVisible"},
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "MediaList",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "MediaQueryList",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "MediaRecorder",
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    {name: "MediaSource", pref: "media.mediasource.enabled"},
+    {name: "MediaSource", desktop: true, linux: false, release: false},
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "MediaStream",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "MediaStreamAudioDestinationNode",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "MediaStreamAudioSourceNode",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     {name: "MediaStreamEvent", pref: "media.peerconnection.enabled"},
@@ -924,19 +924,19 @@ var interfaceNamesInGlobalScope =
     {name: "ShadowRoot", pref: "dom.webcomponents.enabled"},
 // IMPORTANT: Do not change this list without review from a DOM peer!
     {name: "SharedWorker", pref: "dom.workers.sharedWorkers.enabled"},
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "SimpleGestureEvent",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     {name: "SimpleTest", xbl: false},
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    {name: "SourceBuffer", pref: "media.mediasource.enabled"},
+    {name: "SourceBuffer", desktop: true, linux: false, release: false},
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    {name: "SourceBufferList", pref: "media.mediasource.enabled"},
+    {name: "SourceBufferList", desktop: true, linux: false, release: false},
 // IMPORTANT: Do not change this list without review from a DOM peer!
     {name: "SpeechSynthesisEvent", b2g: true},
 // IMPORTANT: Do not change this list without review from a DOM peer!
     {name: "SpeechSynthesis", b2g: true},
 // IMPORTANT: Do not change this list without review from a DOM peer!
     {name: "SpeechSynthesisUtterance", b2g: true},
 // IMPORTANT: Do not change this list without review from a DOM peer!
     {name: "SpeechSynthesisVoice", b2g: true},
@@ -1284,17 +1284,17 @@ var interfaceNamesInGlobalScope =
     "URL",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "URLSearchParams",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "UserProximityEvent",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "ValidityState",
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    {name: "VideoPlaybackQuality", pref: "media.mediasource.enabled"},
+    {name: "VideoPlaybackQuality", desktop: true, linux: false, release: false},
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "VideoStreamTrack",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     {name: "VRDevice", pref: "dom.vr.enabled"},
 // IMPORTANT: Do not change this list without review from a DOM peer!
     {name: "VRPositionState", pref: "dom.vr.enabled"},
 // IMPORTANT: Do not change this list without review from a DOM peer!
     {name: "VRFieldOfView", pref: "dom.vr.enabled"},
@@ -1386,16 +1386,19 @@ var interfaceNamesInGlobalScope =
 
 function createInterfaceMap(isXBLScope) {
   var prefs = SpecialPowers.Services.prefs;
   var version = SpecialPowers.Cc["@mozilla.org/xre/app-info;1"].getService(SpecialPowers.Ci.nsIXULAppInfo).version;
   var isNightly = version.endsWith("a1");
   var isRelease = !version.includes("a");
   var isDesktop = !/Mobile|Tablet/.test(navigator.userAgent);
   var isB2G = !isDesktop && !navigator.userAgent.includes("Android");
+  var isMac = /Mac OS/.test(navigator.oscpu);
+  var isWindows = /Windows/.test(navigator.oscpu);
+  var isLinux = /Linux/.test(navigator.oscpu);
   var isAndroid = navigator.userAgent.includes("Android");
   var hasPermission = function (aPermissions) {
     var result = false;
     for (var p of aPermissions) {
       result = result || SpecialPowers.hasPermission(p, window.document);
     }
     return result;
   };
@@ -1406,16 +1409,19 @@ function createInterfaceMap(isXBLScope) 
   {
     for (var entry of interfaces) {
       if (typeof(entry) === "string") {
         interfaceMap[entry] = true;
       } else if ((entry.nightly === !isNightly) ||
                  (entry.xbl === !isXBLScope) ||
                  (entry.desktop === !isDesktop) ||
                  (entry.b2g === !isB2G) ||
+                 (entry.windows === !isWindows) ||
+                 (entry.mac === !isMac) ||
+                 (entry.linux === !isLinux) ||
                  (entry.android === !isAndroid) ||
                  (entry.release === !isRelease) ||
                  (entry.pref && !prefs.getBoolPref(entry.pref))  ||
                  (entry.permission && !hasPermission(entry.permission))) {
         interfaceMap[entry.name] = false;
       } else {
         interfaceMap[entry.name] = true;
       }
--- a/testing/profiles/prefs_general.js
+++ b/testing/profiles/prefs_general.js
@@ -160,18 +160,16 @@ user_pref("layout.css.font-loading-api.e
 
 // Enable unicode-range for testing
 user_pref("layout.css.unicode-range.enabled", true);
 
 // Disable spammy layout warnings because they pollute test logs
 user_pref("layout.spammy_warnings.enabled", false);
 
 // Enable Media Source Extensions for testing
-user_pref("media.mediasource.enabled", true);
-user_pref("media.mediasource.whitelist", false);
 user_pref("media.mediasource.mp4.enabled", true);
 user_pref("media.mediasource.webm.enabled", true);
 
 // Enable mozContacts
 user_pref("dom.mozContacts.enabled", true);
 
 // Enable mozSettings
 user_pref("dom.mozSettings.enabled", true);
--- a/testing/web-platform/meta/media-source/SourceBuffer-abort-readyState.html.ini
+++ b/testing/web-platform/meta/media-source/SourceBuffer-abort-readyState.html.ini
@@ -1,6 +1,7 @@
 [SourceBuffer-abort-readyState.html]
   type: testharness
+  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
   [SourceBuffer#abort() (video/mp4) : If the readyState attribute of the parent media source is not in the "open" state then throw an INVALID_STATE_ERR exception and abort these steps.]
     expected:
       if not debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
 
--- a/testing/web-platform/meta/media-source/SourceBuffer-abort-removed.html.ini
+++ b/testing/web-platform/meta/media-source/SourceBuffer-abort-removed.html.ini
@@ -1,6 +1,7 @@
 [SourceBuffer-abort-removed.html]
   type: testharness
+  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
   [SourceBuffer#abort (video/mp4) : if this object has been removed from the sourceBuffers attribute of the parent media source, then throw an INVALID_STATE_ERR exception and abort these steps.]
     expected:
       if not debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
 
--- a/testing/web-platform/meta/media-source/SourceBuffer-abort-updating.html.ini
+++ b/testing/web-platform/meta/media-source/SourceBuffer-abort-updating.html.ini
@@ -1,6 +1,7 @@
 [SourceBuffer-abort-updating.html]
   type: testharness
+  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
   [SourceBuffer#abort() (video/mp4) : Check the algorithm when the updating attribute is true.]
     expected:
       if not debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
 
--- a/testing/web-platform/meta/media-source/SourceBuffer-abort.html.ini
+++ b/testing/web-platform/meta/media-source/SourceBuffer-abort.html.ini
@@ -1,6 +1,7 @@
 [SourceBuffer-abort.html]
   type: testharness
+  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
   [SourceBuffer#abort() (video/mp4): Check the values of appendWindowStart and appendWindowEnd.]
     expected:
       if not debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
 
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/meta/media-source/URL-createObjectURL-revoke.html.ini
@@ -0,0 +1,4 @@
+[URL-createObjectURL-revoke.html]
+  type: testharness
+  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
+
--- a/testing/web-platform/meta/media-source/URL-createObjectURL.html.ini
+++ b/testing/web-platform/meta/media-source/URL-createObjectURL.html.ini
@@ -1,5 +1,6 @@
 [URL-createObjectURL.html]
   type: testharness
+  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
   [URL.createObjectURL(mediaSource) should return a unique Blob URI.]
     expected: FAIL
 
--- a/testing/web-platform/meta/media-source/interfaces.html.ini
+++ b/testing/web-platform/meta/media-source/interfaces.html.ini
@@ -1,10 +1,11 @@
 [interfaces.html]
   type: testharness
+  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
   [AudioTrack interface: attribute kind]
     expected: FAIL
 
   [AudioTrack interface: attribute language]
     expected: FAIL
 
   [AudioTrack interface: attribute sourceBuffer]
     expected: FAIL
--- a/testing/web-platform/meta/media-source/mediasource-addsourcebuffer.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-addsourcebuffer.html.ini
@@ -1,10 +1,11 @@
 [mediasource-addsourcebuffer.html]
   type: testharness
+  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
   [Test addSourceBuffer() with AAC and H.264]
     expected:
       if os == "linux": FAIL
       if (os == "win") and (version == "5.1.2600"): FAIL
 
   [Test addSourceBuffer() with AAC and H.264 in separate SourceBuffers]
     expected:
       if os == "linux": FAIL
--- a/testing/web-platform/meta/media-source/mediasource-append-buffer.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-append-buffer.html.ini
@@ -1,5 +1,6 @@
 [mediasource-append-buffer.html]
   type: testharness
+  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
   disabled:
     if (os == "win") and (version != "5.1.2600"): https://bugzilla.mozilla.org/show_bug.cgi?id=1143650
     if os == "mac": https://bugzilla.mozilla.org/show_bug.cgi?id=1143650
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/meta/media-source/mediasource-appendwindow.html.ini
@@ -0,0 +1,3 @@
+[mediasource-appendwindow.html]
+  type: testharness
+  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
--- a/testing/web-platform/meta/media-source/mediasource-buffered.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-buffered.html.ini
@@ -1,10 +1,11 @@
 [mediasource-buffered.html]
   type: testharness
+  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
   [Demuxed content with different lengths]
     expected:
       if os == "linux": FAIL
       if (os == "win") and (version == "5.1.2600"): FAIL
 
   [Muxed content with different lengths]
     expected: FAIL
 
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/meta/media-source/mediasource-closed.html.ini
@@ -0,0 +1,3 @@
+[mediasource-closed.html]
+  type: testharness
+  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
--- a/testing/web-platform/meta/media-source/mediasource-config-change-mp4-a-bitrate.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-config-change-mp4-a-bitrate.html.ini
@@ -1,3 +1,4 @@
 [mediasource-config-change-mp4-a-bitrate.html]
   type: testharness
+  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
   disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1130973
--- a/testing/web-platform/meta/media-source/mediasource-config-change-mp4-av-audio-bitrate.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-config-change-mp4-av-audio-bitrate.html.ini
@@ -1,7 +1,8 @@
 [mediasource-config-change-mp4-av-audio-bitrate.html]
   type: testharness
+  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
   [Tests mp4 audio bitrate changes in multiplexed content.]
     expected:
       if os == "linux": FAIL
       if (os == "win") and (version == "5.1.2600"): FAIL
 
--- a/testing/web-platform/meta/media-source/mediasource-config-change-mp4-av-framesize.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-config-change-mp4-av-framesize.html.ini
@@ -1,7 +1,8 @@
 [mediasource-config-change-mp4-av-framesize.html]
   type: testharness
+  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
   [Tests mp4 frame size changes in multiplexed content.]
     expected:
       if os == "linux": FAIL
       if (os == "win") and (version == "5.1.2600"): FAIL
 
--- a/testing/web-platform/meta/media-source/mediasource-config-change-mp4-av-video-bitrate.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-config-change-mp4-av-video-bitrate.html.ini
@@ -1,7 +1,8 @@
 [mediasource-config-change-mp4-av-video-bitrate.html]
   type: testharness
+  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
   [Tests mp4 video bitrate changes in multiplexed content.]
     expected:
       if os == "linux": FAIL
       if (os == "win") and (version == "5.1.2600"): FAIL
 
--- a/testing/web-platform/meta/media-source/mediasource-config-change-mp4-v-bitrate.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-config-change-mp4-v-bitrate.html.ini
@@ -1,7 +1,8 @@
 [mediasource-config-change-mp4-v-bitrate.html]
   type: testharness
+  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
   [Tests mp4 video-only bitrate changes.]
     expected:
       if os == "linux": FAIL
       if (os == "win") and (version == "5.1.2600"): FAIL
 
--- a/testing/web-platform/meta/media-source/mediasource-config-change-mp4-v-framerate.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-config-change-mp4-v-framerate.html.ini
@@ -1,7 +1,8 @@
 [mediasource-config-change-mp4-v-framerate.html]
   type: testharness
+  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
   [Tests mp4 video-only frame rate changes.]
     expected:
       if os == "linux": FAIL
       if (os == "win") and (version == "5.1.2600"): FAIL
 
--- a/testing/web-platform/meta/media-source/mediasource-config-change-mp4-v-framesize.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-config-change-mp4-v-framesize.html.ini
@@ -1,7 +1,8 @@
 [mediasource-config-change-mp4-v-framesize.html]
   type: testharness
+  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
   [Tests mp4 video-only frame size changes.]
     expected:
       if os == "linux": FAIL
       if (os == "win") and (version == "5.1.2600"): FAIL
 
--- a/testing/web-platform/meta/media-source/mediasource-config-change-webm-a-bitrate.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-config-change-webm-a-bitrate.html.ini
@@ -1,3 +1,4 @@
 [mediasource-config-change-webm-a-bitrate.html]
   type: testharness
+  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
   disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1134888
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/meta/media-source/mediasource-config-change-webm-av-audio-bitrate.html.ini
@@ -0,0 +1,3 @@
+[mediasource-config-change-webm-av-audio-bitrate.html]
+  type: testharness
+  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/meta/media-source/mediasource-config-change-webm-av-framesize.html.ini
@@ -0,0 +1,3 @@
+[mediasource-config-change-webm-av-framesize.html]
+  type: testharness
+  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/meta/media-source/mediasource-config-change-webm-av-video-bitrate.html.ini
@@ -0,0 +1,3 @@
+[mediasource-config-change-webm-av-video-bitrate.html]
+  type: testharness
+  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/meta/media-source/mediasource-config-change-webm-v-bitrate.html.ini
@@ -0,0 +1,3 @@
+[mediasource-config-change-webm-v-bitrate.html]
+  type: testharness
+  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/meta/media-source/mediasource-config-change-webm-v-framerate.html.ini
@@ -0,0 +1,3 @@
+[mediasource-config-change-webm-v-framerate.html]
+  type: testharness
+  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/meta/media-source/mediasource-config-change-webm-v-framesize.html.ini
@@ -0,0 +1,3 @@
+[mediasource-config-change-webm-v-framesize.html]
+  type: testharness
+  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/meta/media-source/mediasource-duration-boundaryconditions.html.ini
@@ -0,0 +1,3 @@
+[mediasource-duration-boundaryconditions.html]
+  type: testharness
+  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
--- a/testing/web-platform/meta/media-source/mediasource-duration.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-duration.html.ini
@@ -1,10 +1,11 @@
 [mediasource-duration.html]
   type: testharness
+  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
   [Test seek starts on duration truncation below currentTime]
     expected:
       if (os == "win") and (version != "5.1.2600"): PASS
       if os == "mac": PASS
       FAIL
 
   [Test appendBuffer completes previous seek to truncated duration]
     expected:
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/meta/media-source/mediasource-endofstream-invaliderror.html.ini
@@ -0,0 +1,3 @@
+[mediasource-endofstream-invaliderror.html]
+  type: testharness
+  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
--- a/testing/web-platform/meta/media-source/mediasource-getvideoplaybackquality.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-getvideoplaybackquality.html.ini
@@ -1,3 +1,4 @@
 [mediasource-getvideoplaybackquality.html]
   type: testharness
+  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
   disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1066467
--- a/testing/web-platform/meta/media-source/mediasource-is-type-supported.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-is-type-supported.html.ini
@@ -1,10 +1,11 @@
 [mediasource-is-type-supported.html]
   type: testharness
+  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
   [Test invalid MIME format "video/webm"]
     expected: FAIL
 
   [Test invalid MIME format "video/webm;"]
     expected: FAIL
 
   [Test invalid MIME format "video/webm;codecs"]
     expected: FAIL
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/meta/media-source/mediasource-multiple-attach.html.ini
@@ -0,0 +1,3 @@
+[mediasource-multiple-attach.html]
+  type: testharness
+  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
--- a/testing/web-platform/meta/media-source/mediasource-play-then-seek-back.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-play-then-seek-back.html.ini
@@ -1,3 +1,4 @@
 [mediasource-play-then-seek-back.html]
   type: testharness
+  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
   disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1128069
--- a/testing/web-platform/meta/media-source/mediasource-play.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-play.html.ini
@@ -1,3 +1,4 @@
 [mediasource-play.html]
   type: testharness
+  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
   disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1066467
--- a/testing/web-platform/meta/media-source/mediasource-redundant-seek.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-redundant-seek.html.ini
@@ -1,10 +1,11 @@
 [mediasource-redundant-seek.html]
   type: testharness
+  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
   expected:
     if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): TIMEOUT
     if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
     if not debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
   [Test redundant fully prebuffered seek]
     expected:
       if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): TIMEOUT
       if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
--- a/testing/web-platform/meta/media-source/mediasource-remove.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-remove.html.ini
@@ -1,10 +1,11 @@
 [mediasource-remove.html]
   type: testharness
+  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
   [Test removing all appended data.]
     expected: FAIL
 
   [Test removing beginning of appended data.]
     expected: FAIL
 
   [Test removing the middle of appended data.]
     expected: FAIL
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/meta/media-source/mediasource-removesourcebuffer.html.ini
@@ -0,0 +1,3 @@
+[mediasource-removesourcebuffer.html]
+  type: testharness
+  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
--- a/testing/web-platform/meta/media-source/mediasource-seek-beyond-duration.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-seek-beyond-duration.html.ini
@@ -1,9 +1,10 @@
 [mediasource-seek-beyond-duration.html]
   type: testharness
+  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
   disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1093945
   [Test seeking beyond updated media duration.]
     disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1093945
 
   [Test seeking beyond media duration.]
     disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1066467
 
--- a/testing/web-platform/meta/media-source/mediasource-seek-during-pending-seek.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-seek-during-pending-seek.html.ini
@@ -1,9 +1,10 @@
 [mediasource-seek-during-pending-seek.html]
   type: testharness
+  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
   disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1093945
   [Test seeking to a new location before transitioning beyond HAVE_METADATA.]
     disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1093945
 
   [Test seeking to a new location during a pending seek.]
     disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1093945
 
--- a/testing/web-platform/meta/media-source/mediasource-sequencemode-append-buffer.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-sequencemode-append-buffer.html.ini
@@ -1,10 +1,11 @@
 [mediasource-sequencemode-append-buffer.html]
   type: testharness
+  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
   [Test sequence AppendMode appendBuffer(first media segment)]
     expected: FAIL
 
   [Test sequence AppendMode appendBuffer(second media segment)]
     expected: FAIL
 
   [Test sequence AppendMode appendBuffer(second media segment, then first media segment)]
     expected: FAIL
--- a/testing/web-platform/meta/media-source/mediasource-sourcebuffer-mode.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-sourcebuffer-mode.html.ini
@@ -1,8 +1,9 @@
 [mediasource-sourcebuffer-mode.html]
   type: testharness
+  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
   [Test setting SourceBuffer.mode]
     expected: FAIL
 
   [Test setting SourceBuffer.mode and SourceBuffer.timestampOffset while parsing media segment.]
     expected: FAIL
 
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/meta/media-source/mediasource-sourcebufferlist.html.ini
@@ -0,0 +1,3 @@
+[mediasource-sourcebufferlist.html]
+  type: testharness
+  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/meta/media-source/mediasource-timestamp-offset.html.ini
@@ -0,0 +1,3 @@
+[mediasource-timestamp-offset.html]
+  type: testharness
+  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]