Bug 1185611: [MSE] P1. Remove whitelist. r=kinetik
authorJean-Yves Avenard <jyavenard@mozilla.com>
Fri, 31 Jul 2015 09:48:09 +1000
changeset 255660 135ffa347689f982bedee5acf92049a5820a7a62
parent 255659 be21dfb89dc7896dc55c01902745758dcdbb1f76
child 255661 4064f631f28a4192ce6fad615a01b29958d659b9
push id29151
push userkwierso@gmail.com
push dateSat, 01 Aug 2015 00:10:09 +0000
treeherdermozilla-central@aeb85029c3b3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskinetik
bugs1185611
milestone42.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 1185611: [MSE] P1. Remove whitelist. r=kinetik We are now confident enough that MediaSource is usable by all
dom/media/mediasource/MediaSource.cpp
dom/media/mediasource/test/crashtests/1005366.html
dom/media/mediasource/test/crashtests/1059035.html
dom/media/mediasource/test/crashtests/crashtests.list
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
modules/libpref/init/all.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/MediaSource.cpp
+++ b/dom/media/mediasource/MediaSource.cpp
@@ -13,24 +13,20 @@
 #include "SourceBufferList.h"
 #include "mozilla/ErrorResult.h"
 #include "mozilla/FloatingPoint.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/HTMLMediaElement.h"
 #include "mozilla/mozalloc.h"
 #include "nsContentTypeParser.h"
-#include "nsContentUtils.h"
 #include "nsDebug.h"
 #include "nsError.h"
-#include "nsIEffectiveTLDService.h"
 #include "nsIRunnable.h"
 #include "nsIScriptObjectPrincipal.h"
-#include "nsIURI.h"
-#include "nsNetCID.h"
 #include "nsPIDOMWindow.h"
 #include "nsString.h"
 #include "nsThreadUtils.h"
 #include "mozilla/Logging.h"
 #include "nsServiceManagerUtils.h"
 
 #ifdef MOZ_WIDGET_ANDROID
 #include "AndroidBridge.h"
@@ -336,56 +332,17 @@ MediaSource::IsTypeSupported(const Globa
           NS_ConvertUTF16toUTF8(aType).get(), rv == NS_OK ? "OK" : "[not supported]");
 #undef this // don't ever remove this line !
   return NS_SUCCEEDED(rv);
 }
 
 /* static */ bool
 MediaSource::Enabled(JSContext* cx, JSObject* aGlobal)
 {
-  MOZ_ASSERT(NS_IsMainThread());
-
-  // Don't use aGlobal across Preferences stuff, which the static
-  // analysis thinks can GC.
-  JS::Rooted<JSObject*> global(cx, aGlobal);
-
-  bool enabled = Preferences::GetBool("media.mediasource.enabled");
-  if (!enabled) {
-    return false;
-  }
-
-  // Check whether it's enabled everywhere or just whitelisted sites.
-  bool restrict = Preferences::GetBool("media.mediasource.whitelist", false);
-  if (!restrict) {
-    return true;
-  }
-
-  // We want to restrict to YouTube only.
-  // We define that as the origin being *.youtube.com.
-  // We also support *.youtube-nocookie.com
-  nsIPrincipal* principal = nsContentUtils::ObjectPrincipal(global);
-  nsCOMPtr<nsIURI> uri;
-  if (NS_FAILED(principal->GetURI(getter_AddRefs(uri))) || !uri) {
-    return false;
-  }
-
-  nsCOMPtr<nsIEffectiveTLDService> tldServ =
-    do_GetService(NS_EFFECTIVETLDSERVICE_CONTRACTID);
-  NS_ENSURE_TRUE(tldServ, false);
-
-  nsAutoCString eTLDplusOne;
-   if (NS_FAILED(tldServ->GetBaseDomain(uri, 0, eTLDplusOne))) {
-     return false;
-   }
-
-   return eTLDplusOne.EqualsLiteral("youtube.com") ||
-          eTLDplusOne.EqualsLiteral("youtube-nocookie.com") ||
-          eTLDplusOne.EqualsLiteral("netflix.com") ||
-          eTLDplusOne.EqualsLiteral("dailymotion.com") ||
-          eTLDplusOne.EqualsLiteral("dmcdn.net");
+  return Preferences::GetBool("media.mediasource.enabled");
 }
 
 bool
 MediaSource::Attach(MediaSourceDecoder* aDecoder)
 {
   MOZ_ASSERT(NS_IsMainThread());
   MSE_DEBUG("Attach(aDecoder=%p) owner=%p", aDecoder, aDecoder->GetOwner());
   MOZ_ASSERT(aDecoder);
--- a/dom/media/mediasource/test/crashtests/1005366.html
+++ b/dom/media/mediasource/test/crashtests/1005366.html
@@ -1,17 +1,16 @@
 <!DOCTYPE html>
 <html>
 <head>
 <meta charset="UTF-8">
 <script>
 
 /*
 user_pref("media.mediasource.enabled", true);
-user_pref("media.mediasource.whitelist", false);
 */
 
 function boom()
 {
     var source = new window.MediaSource();
     var videoElement = document.createElementNS('http://www.w3.org/1999/xhtml', 'video');
     videoElement.src = URL.createObjectURL(source);
 
--- a/dom/media/mediasource/test/crashtests/1059035.html
+++ b/dom/media/mediasource/test/crashtests/1059035.html
@@ -1,16 +1,15 @@
 <!DOCTYPE html>
 <html>
 <head>
 <script>
 
 /*
 user_pref("media.mediasource.enabled", true);
-user_pref("media.mediasource.whitelist", false);
 */
 
 function boom()
 {
     var mediaSource = new MediaSource();
     var htmlAudio = document.createElement("audio");
     htmlAudio.src = URL.createObjectURL(mediaSource);
 
--- a/dom/media/mediasource/test/crashtests/crashtests.list
+++ b/dom/media/mediasource/test/crashtests/crashtests.list
@@ -1,4 +1,4 @@
-test-pref(media.mediasource.enabled,true) test-pref(media.mediasource.whitelist,false) load 926665.html
-test-pref(media.mediasource.enabled,true) test-pref(media.mediasource.whitelist,false) load 931388.html
-test-pref(media.mediasource.enabled,true) test-pref(media.mediasource.whitelist,false) load 1005366.html
-test-pref(media.mediasource.enabled,true) test-pref(media.mediasource.whitelist,false) load 1059035.html
+test-pref(media.mediasource.enabled,true) load 926665.html
+test-pref(media.mediasource.enabled,true) load 931388.html
+test-pref(media.mediasource.enabled,true) load 1005366.html
+test-pref(media.mediasource.enabled,true) load 1059035.html
--- a/dom/media/mediasource/test/mediasource.js
+++ b/dom/media/mediasource/test/mediasource.js
@@ -14,17 +14,16 @@ function runWithMSE(testFunction) {
     });
 
     testFunction(ms, el);
   }
 
   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();
--- a/dom/media/mediasource/test/test_MediaSource_disabled.html
+++ b/dom/media/mediasource/test/test_MediaSource_disabled.html
@@ -17,17 +17,16 @@ 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
@@ -394,17 +394,16 @@ 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 ],
     [ "media.eme.apiVisible", true ],
   ];
 
   if (/Linux/.test(manifestNavigator().userAgent)) {
     prefs.push([ "media.fragmented-mp4.ffmpeg.enabled", true ]);
   } else if (SpecialPowers.Services.appinfo.name == "B2G" ||
              !manifestVideo().canPlayType("video/mp4")) {
--- a/dom/media/test/test_VideoPlaybackQuality.html
+++ b/dom/media/test/test_VideoPlaybackQuality.html
@@ -49,16 +49,15 @@ function 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,16 +23,15 @@ 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/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -466,22 +466,16 @@ pref("media.track.enabled", false);
 // but on release builds restrict to YouTube. We don't enable for other
 // configurations because code for those platforms isn't ready yet.
 #if defined(XP_WIN) || defined(XP_MACOSX) || defined(MOZ_WIDGET_GONK)
 pref("media.mediasource.enabled", true);
 #else
 pref("media.mediasource.enabled", false);
 #endif
 
-#ifdef RELEASE_BUILD
-pref("media.mediasource.whitelist", true);
-#else
-pref("media.mediasource.whitelist", false);
-#endif // RELEASE_BUILD
-
 pref("media.mediasource.mp4.enabled", true);
 pref("media.mediasource.webm.enabled", false);
 
 #if defined(MOZ_WIDGET_GONK)
 pref("media.mediasource.format-reader", false);
 #else
 // Enable new MediaSource architecture.
 pref("media.mediasource.format-reader", 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,11 +1,11 @@
 [SourceBuffer-abort-readyState.html]
   type: testharness
-  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
+  prefs: [media.mediasource.enabled:true]
   [SourceBuffer#abort() (video/webm; codecs="vorbis,vp8") : 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: FAIL
 
   [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 os == "linux": FAIL
       if (os == "win") and (version == "5.1.2600"): 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,11 +1,11 @@
 [SourceBuffer-abort-removed.html]
   type: testharness
-  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
+  prefs: [media.mediasource.enabled:true]
   [SourceBuffer#abort (video/webm; codecs="vorbis,vp8") : 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: FAIL
 
   [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 os == "linux": FAIL
       if (os == "win") and (version == "5.1.2600"): 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,11 +1,11 @@
 [SourceBuffer-abort-updating.html]
   type: testharness
-  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
+  prefs: [media.mediasource.enabled:true]
   [SourceBuffer#abort() (video/webm; codecs="vorbis,vp8") : Check the algorithm when the updating attribute is true.]
     expected: FAIL
 
   [SourceBuffer#abort() (video/mp4) : Check the algorithm when the updating attribute is true.]
     expected:
       if os == "linux": FAIL
       if (os == "win") and (version == "5.1.2600"): FAIL
 
--- a/testing/web-platform/meta/media-source/SourceBuffer-abort.html.ini
+++ b/testing/web-platform/meta/media-source/SourceBuffer-abort.html.ini
@@ -1,11 +1,11 @@
 [SourceBuffer-abort.html]
   type: testharness
-  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
+  prefs: [media.mediasource.enabled:true]
   [SourceBuffer#abort() (video/webm; codecs="vorbis,vp8"): Check the values of appendWindowStart and appendWindowEnd.]
     expected: FAIL
 
   [SourceBuffer#abort() (video/mp4): Check the values of appendWindowStart and appendWindowEnd.]
     expected:
       if os == "linux": FAIL
       if (os == "win") and (version == "5.1.2600"): FAIL
 
--- a/testing/web-platform/meta/media-source/URL-createObjectURL-revoke.html.ini
+++ b/testing/web-platform/meta/media-source/URL-createObjectURL-revoke.html.ini
@@ -1,3 +1,3 @@
 [URL-createObjectURL-revoke.html]
   type: testharness
-  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
+  prefs: [media.mediasource.enabled:true]
--- a/testing/web-platform/meta/media-source/URL-createObjectURL.html.ini
+++ b/testing/web-platform/meta/media-source/URL-createObjectURL.html.ini
@@ -1,6 +1,6 @@
 [URL-createObjectURL.html]
   type: testharness
-  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
+  prefs: [media.mediasource.enabled:true]
   [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,4 +1,4 @@
 [interfaces.html]
   type: testharness
-  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
+  prefs: [media.mediasource.enabled:true]
   expected: ERROR
--- a/testing/web-platform/meta/media-source/mediasource-addsourcebuffer.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-addsourcebuffer.html.ini
@@ -1,11 +1,11 @@
 [mediasource-addsourcebuffer.html]
   type: testharness
-  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
+  prefs: [media.mediasource.enabled:true]
   [Test addSourceBuffer() with Vorbis and VP8]
     expected: FAIL
 
   [Test addSourceBuffer() with Vorbis and VP8 in separate SourceBuffers]
     expected: FAIL
 
   [Test addSourceBuffer() in 'ended' state.]
     expected:
--- 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,11 +1,11 @@
 [mediasource-append-buffer.html]
   type: testharness
-  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
+  prefs: [media.mediasource.enabled:true]
   [Test SourceBuffer.appendBuffer() event dispatching.]
     expected:
       if os == "linux": FAIL
       if (os == "win") and (version == "5.1.2600"): FAIL
 
   [Test SourceBuffer.appendBuffer() call during a pending appendBuffer().]
     expected:
       if os == "linux": FAIL
--- a/testing/web-platform/meta/media-source/mediasource-appendwindow.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-appendwindow.html.ini
@@ -1,11 +1,11 @@
 [mediasource-appendwindow.html]
   type: testharness
-  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
+  prefs: [media.mediasource.enabled:true]
   [Test correctly reset appendWindowStart and appendWindowEnd values]
     expected:
       if os == "linux": FAIL
       if (os == "win") and (version == "5.1.2600"): FAIL
 
   [Test set wrong values to appendWindowStart and appendWindowEnd.]
     expected:
       if os == "linux": FAIL
--- a/testing/web-platform/meta/media-source/mediasource-buffered.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-buffered.html.ini
@@ -1,11 +1,11 @@
 [mediasource-buffered.html]
   type: testharness
-  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
+  prefs: [media.mediasource.enabled:true]
   disabled:
     if os == "linux": https://bugzilla.mozilla.org/show_bug.cgi?id=1182945
     if (os == "win") and (version == "5.1.2600"): https://bugzilla.mozilla.org/show_bug.cgi?id=1182945
   [Demuxed content with different lengths]
     expected: FAIL
 
   [Muxed content with different lengths]
     expected: FAIL
--- a/testing/web-platform/meta/media-source/mediasource-closed.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-closed.html.ini
@@ -1,11 +1,11 @@
 [mediasource-closed.html]
   type: testharness
-  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
+  prefs: [media.mediasource.enabled:true]
   [Test addSourceBuffer() while closed.]
     expected:
       if os == "linux": FAIL
       if (os == "win") and (version == "5.1.2600"): FAIL
 
   [Test removeSourceBuffer() while closed.]
     expected:
       if os == "linux": FAIL
--- 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,4 +1,4 @@
 [mediasource-config-change-mp4-a-bitrate.html]
   type: testharness
-  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
+  prefs: [media.mediasource.enabled:true]
   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,4 +1,4 @@
 [mediasource-config-change-mp4-av-audio-bitrate.html]
   type: testharness
-  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
+  prefs: [media.mediasource.enabled:true]
   disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1130973
--- 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,8 +1,8 @@
 [mediasource-config-change-mp4-av-framesize.html]
   type: testharness
-  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
+  prefs: [media.mediasource.enabled:true]
   [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,8 +1,8 @@
 [mediasource-config-change-mp4-av-video-bitrate.html]
   type: testharness
-  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
+  prefs: [media.mediasource.enabled:true]
   [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,8 +1,8 @@
 [mediasource-config-change-mp4-v-bitrate.html]
   type: testharness
-  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
+  prefs: [media.mediasource.enabled:true]
   [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,8 +1,8 @@
 [mediasource-config-change-mp4-v-framerate.html]
   type: testharness
-  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
+  prefs: [media.mediasource.enabled:true]
   [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,8 +1,8 @@
 [mediasource-config-change-mp4-v-framesize.html]
   type: testharness
-  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
+  prefs: [media.mediasource.enabled:true]
   [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,9 +1,9 @@
 [mediasource-config-change-webm-a-bitrate.html]
   type: testharness
-  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
+  prefs: [media.mediasource.enabled:true]
   disabled:
     if os == "linux": https://bugzilla.mozilla.org/show_bug.cgi?id=1186261
     if (os == "win") and (version == "5.1.2600"): https://bugzilla.mozilla.org/show_bug.cgi?id=1186261
   [Tests webm audio-only bitrate changes.]
     expected: FAIL
 
--- a/testing/web-platform/meta/media-source/mediasource-config-change-webm-av-audio-bitrate.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-config-change-webm-av-audio-bitrate.html.ini
@@ -1,6 +1,6 @@
 [mediasource-config-change-webm-av-audio-bitrate.html]
   type: testharness
-  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
+  prefs: [media.mediasource.enabled:true]
   [Tests webm audio bitrate changes in multiplexed content.]
     expected: FAIL
 
--- a/testing/web-platform/meta/media-source/mediasource-config-change-webm-av-framesize.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-config-change-webm-av-framesize.html.ini
@@ -1,9 +1,9 @@
 [mediasource-config-change-webm-av-framesize.html]
   type: testharness
-  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
+  prefs: [media.mediasource.enabled:true]
   disabled:
     if os == "linux": https://bugzilla.mozilla.org/show_bug.cgi?id=1186261
     if (os == "win") and (version == "5.1.2600"): https://bugzilla.mozilla.org/show_bug.cgi?id=1186261
   [Tests webm frame size changes in multiplexed content.]
     expected: FAIL
 
--- a/testing/web-platform/meta/media-source/mediasource-config-change-webm-av-video-bitrate.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-config-change-webm-av-video-bitrate.html.ini
@@ -1,6 +1,6 @@
 [mediasource-config-change-webm-av-video-bitrate.html]
   type: testharness
-  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
+  prefs: [media.mediasource.enabled:true]
   [Tests webm video bitrate changes in multiplexed content.]
     expected: FAIL
 
--- a/testing/web-platform/meta/media-source/mediasource-config-change-webm-v-bitrate.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-config-change-webm-v-bitrate.html.ini
@@ -1,9 +1,9 @@
 [mediasource-config-change-webm-v-bitrate.html]
   type: testharness
-  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
+  prefs: [media.mediasource.enabled:true]
   disabled:
     if os == "linux": https://bugzilla.mozilla.org/show_bug.cgi?id=1186261
     if (os == "win") and (version == "5.1.2600"): https://bugzilla.mozilla.org/show_bug.cgi?id=1186261
   [Tests webm video-only bitrate changes.]
     expected: FAIL
 
--- a/testing/web-platform/meta/media-source/mediasource-config-change-webm-v-framerate.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-config-change-webm-v-framerate.html.ini
@@ -1,9 +1,9 @@
 [mediasource-config-change-webm-v-framerate.html]
   type: testharness
-  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
+  prefs: [media.mediasource.enabled:true]
   disabled:
     if os == "linux": https://bugzilla.mozilla.org/show_bug.cgi?id=1186261
     if (os == "win") and (version == "5.1.2600"): https://bugzilla.mozilla.org/show_bug.cgi?id=1186261
   [Tests webm video-only frame rate changes.]
     expected: FAIL
 
--- a/testing/web-platform/meta/media-source/mediasource-config-change-webm-v-framesize.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-config-change-webm-v-framesize.html.ini
@@ -1,9 +1,9 @@
 [mediasource-config-change-webm-v-framesize.html]
   type: testharness
-  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
+  prefs: [media.mediasource.enabled:true]
   disabled:
     if os == "linux": https://bugzilla.mozilla.org/show_bug.cgi?id=1186261
     if (os == "win") and (version == "5.1.2600"): https://bugzilla.mozilla.org/show_bug.cgi?id=1186261
   [Tests webm video-only frame size changes.]
     expected: FAIL
 
--- a/testing/web-platform/meta/media-source/mediasource-duration-boundaryconditions.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-duration-boundaryconditions.html.ini
@@ -1,11 +1,11 @@
 [mediasource-duration-boundaryconditions.html]
   type: testharness
-  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
+  prefs: [media.mediasource.enabled:true]
   [Set duration to 2^31 - 1]
     expected:
       if os == "linux": FAIL
       if (os == "win") and (version == "5.1.2600"): FAIL
 
   [Set duration to 1]
     expected:
       if os == "linux": FAIL
--- a/testing/web-platform/meta/media-source/mediasource-duration.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-duration.html.ini
@@ -1,11 +1,11 @@
 [mediasource-duration.html]
   type: testharness
-  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
+  prefs: [media.mediasource.enabled:true]
   [Test seek starts on duration truncation below currentTime]
     disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1148224
 
   [Test appendBuffer completes previous seek to truncated duration]
     disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1148224
 
   [Test endOfStream completes previous seek to truncated duration]
     disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1148224
--- a/testing/web-platform/meta/media-source/mediasource-endofstream-invaliderror.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-endofstream-invaliderror.html.ini
@@ -1,3 +1,3 @@
 [mediasource-endofstream-invaliderror.html]
   type: testharness
-  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
+  prefs: [media.mediasource.enabled:true]
--- a/testing/web-platform/meta/media-source/mediasource-getvideoplaybackquality.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-getvideoplaybackquality.html.ini
@@ -1,8 +1,8 @@
 [mediasource-getvideoplaybackquality.html]
   type: testharness
-  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
+  prefs: [media.mediasource.enabled:true]
   [Test HTMLVideoElement.getVideoPlaybackQuality() with MediaSource API]
     expected:
       if os == "linux": FAIL
       if (os == "win") and (version == "5.1.2600"): FAIL
 
--- 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,11 +1,11 @@
 [mediasource-is-type-supported.html]
   type: testharness
-  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
+  prefs: [media.mediasource.enabled:true]
   [Test valid WebM type "video/webm;codecs="vp8""]
     expected: FAIL
 
   [Test valid WebM type "video/webm;codecs="vorbis""]
     expected: FAIL
 
   [Test valid WebM type "video/webm;codecs="vp8,vorbis""]
     expected: FAIL
--- a/testing/web-platform/meta/media-source/mediasource-multiple-attach.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-multiple-attach.html.ini
@@ -1,3 +1,3 @@
 [mediasource-multiple-attach.html]
   type: testharness
-  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
+  prefs: [media.mediasource.enabled:true]
--- 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,4 +1,4 @@
 [mediasource-play-then-seek-back.html]
   type: testharness
-  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
+  prefs: [media.mediasource.enabled:true]
   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,8 +1,8 @@
 [mediasource-play.html]
   type: testharness
-  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
+  prefs: [media.mediasource.enabled:true]
   [Test normal playback case with MediaSource API]
     expected:
       if os == "linux": FAIL
       if (os == "win") and (version == "5.1.2600"): FAIL
 
--- 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,8 +1,8 @@
 [mediasource-redundant-seek.html]
   type: testharness
-  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
+  prefs: [media.mediasource.enabled:true]
   [Test redundant fully prebuffered seek]
     expected:
       if os == "linux": FAIL
       if (os == "win") and (version == "5.1.2600"): FAIL
 
--- a/testing/web-platform/meta/media-source/mediasource-remove.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-remove.html.ini
@@ -1,11 +1,11 @@
 [mediasource-remove.html]
   type: testharness
-  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
+  prefs: [media.mediasource.enabled:true]
   [Test removing all appended data.]
     expected: FAIL
 
   [Test removing beginning of appended data.]
     expected: FAIL
 
   [Test removing the middle of appended data.]
     expected: FAIL
--- a/testing/web-platform/meta/media-source/mediasource-removesourcebuffer.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-removesourcebuffer.html.ini
@@ -1,11 +1,11 @@
 [mediasource-removesourcebuffer.html]
   type: testharness
-  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
+  prefs: [media.mediasource.enabled:true]
   [Test addSourceBuffer(), removeSourceBuffer(), addSourceBuffer() sequence.]
     expected:
       if os == "linux": FAIL
       if (os == "win") and (version == "5.1.2600"): FAIL
 
   [Test calling removeSourceBuffer() twice with the same object.]
     expected:
       if os == "linux": FAIL
--- 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,10 +1,10 @@
 [mediasource-seek-beyond-duration.html]
   type: testharness
-  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
+  prefs: [media.mediasource.enabled:true]
   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,11 +1,11 @@
 [mediasource-seek-during-pending-seek.html]
   type: testharness
-  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
+  prefs: [media.mediasource.enabled:true]
   disabled:
     if os == "mac": https://bugzilla.mozilla.org/show_bug.cgi?id=1183523
     if (os == "win") and (version != "5.1.2600"): https://bugzilla.mozilla.org/show_bug.cgi?id=1183523
   [Test seeking to a new location before transitioning beyond HAVE_METADATA.]
     expected:
       if os == "linux": FAIL
       if (os == "win") and (version == "5.1.2600"): FAIL
 
--- 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,11 +1,11 @@
 [mediasource-sequencemode-append-buffer.html]
   type: testharness
-  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
+  prefs: [media.mediasource.enabled:true]
   [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,11 +1,11 @@
 [mediasource-sourcebuffer-mode.html]
   type: testharness
-  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
+  prefs: [media.mediasource.enabled:true]
   [Test initial value of SourceBuffer.mode is "segments"]
     expected:
       if os == "linux": FAIL
       if (os == "win") and (version == "5.1.2600"): FAIL
 
   [Test setting SourceBuffer.mode]
     expected:
       if os == "linux": FAIL
--- a/testing/web-platform/meta/media-source/mediasource-sourcebufferlist.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-sourcebufferlist.html.ini
@@ -1,11 +1,11 @@
 [mediasource-sourcebufferlist.html]
   type: testharness
-  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
+  prefs: [media.mediasource.enabled:true]
   [Test SourceBufferList event dispatching.]
     expected:
       if os == "linux": FAIL
       if (os == "win") and (version == "5.1.2600"): FAIL
 
   [Test that only 1 removesourcebuffer event fires on each SourceBufferList when the MediaSource closes.]
     expected:
       if os == "linux": FAIL
--- a/testing/web-platform/meta/media-source/mediasource-timestamp-offset.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-timestamp-offset.html.ini
@@ -1,11 +1,11 @@
 [mediasource-timestamp-offset.html]
   type: testharness
-  prefs: [media.mediasource.enabled:true, media.mediasource.whitelist:false]
+  prefs: [media.mediasource.enabled:true]
   [Test setting SourceBuffer.timestampOffset to a positive number.]
     expected:
       if os == "linux": FAIL
       if (os == "win") and (version == "5.1.2600"): FAIL
 
   [Test setting SourceBuffer.timestampOffset to a negative number.]
     expected:
       if os == "linux": FAIL