gecko: changeset 200707:b8234b53f28dd018c6d64b86714d6edb063b3f0d

author	Ralph Giles <giles@mozilla.com>
	Wed, 20 Aug 2014 11:06:00 -0700
changeset 200707	b8234b53f28dd018c6d64b86714d6edb063b3f0d
parent 200706	854dd3b3be756d504de67765fb30492a82bf8181
child 200708	177b9f5de1b6e948a745a53e0cb039ed7486186b
push id	1
push user	root
push date	Mon, 20 Oct 2014 17:29:22 +0000
reviewers	cpearce
bugs	1056232
milestone	34.0a1

Bug 1056232 - Expect fmp4 pref in canPlayType. r=cpearce The media.fragmented-mp4.exposed pref affects the support status of video/mp4 reported by canPlayType. Take this into account in the mochitest.

--- a/content/media/test/test_can_play_type_mpeg.html
+++ b/content/media/test/test_can_play_type_mpeg.html
@@ -35,17 +35,18 @@ function getPref(name) {
   try {
     pref = SpecialPowers.getBoolPref(name);
   } catch(ex) { }
   return pref;
 }
 
 var haveMp4 = (getPref("media.windows-media-foundation.enabled") && IsWindowsVistaOrLater()) ||
                getPref("media.omx.enabled") ||
-               getPref("media.gstreamer.enabled");
+               getPref("media.gstreamer.enabled") ||
+               getPref("media.fragmented-mp4.exposed");
 // TODO:  Add "getPref("media.plugins.enabled")" once MP4 works on Gingerbread.
              
 check_mp4(document.getElementById('v'), haveMp4);
 
 var haveMp3 = getPref("media.directshow.enabled") ||
               (getPref("media.windows-media-foundation.enabled") && IsWindowsVistaOrLater()) ||
                getPref("media.omx.enabled") ||
                getPref("media.gstreamer.enabled") ||