From fc4ff6ed4342b6d29122d0dcf821eda110f287ae Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Wed, 5 Aug 2015 08:44:14 -0400
Subject: [PATCH] Bug 1048624 - Cleanup and refactor the media crashtest
 manifests and re-enable some disabled tests that now pass.

---
 dom/media/test/crashtests/crashtests.list | 25 +++++++++++------------
 testing/crashtest/crashtests.list         |  5 ++---
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/dom/media/test/crashtests/crashtests.list b/dom/media/test/crashtests/crashtests.list
index d7c71696aea..bd8cbf199da 100644
--- a/dom/media/test/crashtests/crashtests.list
+++ b/dom/media/test/crashtests/crashtests.list
@@ -1,5 +1,5 @@
-skip-if(Android||B2G) load 0-timescale.html # bug 1048628 for Android
-skip-if(Android||B2G) load 459439-1.html # bug 888557
+skip-if(Android||B2G) load 0-timescale.html # bug 1048628
+skip-if(Android) load 459439-1.html # bug 888557
 load 466607-1.html
 load 466945-1.html
 load 468763-1.html
@@ -71,25 +71,24 @@ load 995289.html
 load 1012609.html
 load 1015662.html
 load 1020205.html
+skip-if(Android||B2G) test-pref(media.navigator.permission.disabled,true) load 1028458.html # bug 1048863
 load 1041466.html
 load 1045650.html
-skip-if(Android||B2G) test-pref(media.navigator.permission.disabled,true) load 1028458.html # bug 1048863
+load 1080986.html
+load 1122218.html
+load 1127188.html
+load 1157994.html
+load 1158427.html
+load 1185176.html
+load 1185192.html
 load analyser-channels-1.html
+load audiocontext-double-suspend.html
 load buffer-source-ended-1.html
 load doppler-1.html
 HTTP load media-element-source-seek-1.html
 load offline-buffer-source-ended-1.html
 load oscillator-ended-1.html
 load oscillator-ended-2.html
-load 1080986.html
-load 1158427.html
-load 1157994.html
-load 1122218.html
-load 1127188.html
-load audiocontext-double-suspend.html
-load 1185176.html
-load 1185192.html
-include ../../mediasource/test/crashtests/crashtests.list
 
 # This needs to run at the end to avoid leaking busted state into other tests.
-skip-if(B2G||winWidget||OSX==1006||OSX==1010&&isDebugBuild) load 691096-1.html
+skip-if(B2G) load 691096-1.html # bug 852821
diff --git a/testing/crashtest/crashtests.list b/testing/crashtest/crashtests.list
index 7d9ee5faab6..c25de9e2771 100644
--- a/testing/crashtest/crashtests.list
+++ b/testing/crashtest/crashtests.list
@@ -15,7 +15,9 @@ include ../../dom/html/crashtests/crashtests.list
 include ../../dom/indexedDB/crashtests/crashtests.list
 include ../../dom/jsurl/crashtests/crashtests.list
 include ../../dom/mathml/crashtests/crashtests.list
+include ../../dom/media/mediasource/test/crashtests/crashtests.list
 include ../../dom/media/test/crashtests/crashtests.list
+skip-if(!webrtc) include ../../dom/media/tests/crashtests/crashtests.list
 include ../../dom/offline/crashtests/crashtests.list
 include ../../dom/plugins/test/crashtests/crashtests.list
 include ../../dom/smil/crashtests/crashtests.list
@@ -27,9 +29,6 @@ include ../../dom/xslt/crashtests/crashtests.list
 include ../../dom/xul/crashtests/crashtests.list
 include ../../dom/xul/templates/crashtests/crashtests.list
 
-# Bug 811873 - mozRTCPeerConnection doesn't support remote browser yet
-skip-if(browserIsRemote||!webrtc) include ../../dom/media/tests/crashtests/crashtests.list
-
 include ../../editor/crashtests.list
 
 include ../../gfx/tests/crashtests/crashtests.list