From 047786024795c1f7bf61b0bd0c7a1dbb67449032 Mon Sep 17 00:00:00 2001
From: Eugen Sawin <esawin@mozilla.com>
Date: Tue, 5 Jan 2016 01:10:51 +0100
Subject: [PATCH] Bug 1232335 - [1.3] Fix test_can_play_type_mpeg for Android.
 r=snorp

---
 dom/media/test/manifest.js                  |  3 ++-
 dom/media/test/test_can_play_type_mpeg.html | 13 ++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/dom/media/test/manifest.js b/dom/media/test/manifest.js
index e7c7a07af7f..88da24fa794 100644
--- a/dom/media/test/manifest.js
+++ b/dom/media/test/manifest.js
@@ -507,7 +507,8 @@ var gUnseekableTests = [
 ];
 
 var androidVersion = -1; // non-Android platforms
-if (manifestNavigator().userAgent.indexOf("Mobile") != -1) {
+if (manifestNavigator().userAgent.indexOf("Mobile") != -1 ||
+    manifestNavigator().userAgent.indexOf("Tablet") != -1) {
   // See nsSystemInfo.cpp, the getProperty('version') returns different value
   // on each platforms, so we need to distinguish the android and B2G platform.
   var versionString = manifestNavigator().userAgent.indexOf("Android") != -1 ?
diff --git a/dom/media/test/test_can_play_type_mpeg.html b/dom/media/test/test_can_play_type_mpeg.html
index cd1e2196d36..eced0790a84 100644
--- a/dom/media/test/test_can_play_type_mpeg.html
+++ b/dom/media/test/test_can_play_type_mpeg.html
@@ -124,13 +124,18 @@ function getPref(name) {
   return pref;
 }
 
+function IsSupportedAndroid() {
+  return getAndroidVersion() >= 14;
+}
+
 function IsJellyBeanOrLater() {
-  return androidVersion >= 16;
+  return getAndroidVersion() >= 16;
 }
 
 var haveMp4 = (getPref("media.wmf.enabled") && IsWindowsVistaOrLater()) ||
               IsMacOSSnowLeopardOrLater() ||
-              IsJellyBeanOrLater() ||
+              (IsAndroid() &&
+               (IsJellyBeanOrLater() || getPref("media.plugins.enabled"))) ||
               getPref("media.omx.enabled") ||
               (IsLinux() && getPref("media.ffmpeg.enabled"));
 
@@ -138,8 +143,10 @@ check_mp4(document.getElementById('v'), haveMp4);
 
 var haveMp3 = getPref("media.directshow.enabled") ||
               (getPref("media.wmf.enabled") && IsWindowsVistaOrLater()) ||
-              (IsJellyBeanOrLater() && getPref("media.android-media-codec.enabled")) ||
               (IsLinux() && getPref("media.ffmpeg.enabled")) ||
+              (IsSupportedAndroid() &&
+               ((IsJellyBeanOrLater() && getPref("media.android-media-codec.enabled")) ||
+                getPref("media.plugins.enabled"))) ||
               getPref("media.apple.mp3.enabled");
 check_mp3(document.getElementById('v'), haveMp3);