From 0bd51a272a1e387751c43bf5708fffde0913ba72 Mon Sep 17 00:00:00 2001
From: Bob Owen <bobowencode@gmail.com>
Date: Thu, 9 Oct 2014 10:09:43 +0100
Subject: [PATCH] Bug 1067305: Conditionally disable media mochitests that
 won't run with the Windows content sandbox at low integrity. r=jmaher

---
 content/media/test/mochitest.ini          | 2 +-
 content/media/webaudio/test/mochitest.ini | 2 +-
 dom/media/tests/mochitest/mochitest.ini   | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/content/media/test/mochitest.ini b/content/media/test/mochitest.ini
index a677dac85b2bf..830a07f4b9800 100644
--- a/content/media/test/mochitest.ini
+++ b/content/media/test/mochitest.ini
@@ -22,7 +22,7 @@
 # do ok(true, "Type not supported") and stop the test.
 
 [DEFAULT]
-skip-if = buildapp == 'mulet'
+skip-if = buildapp == 'mulet' || (os == 'win' && contentSandbox != 'off') # contentSandbox(Bug 1042735)
 support-files =
   320x240.ogv
   320x240.ogv^headers^
diff --git a/content/media/webaudio/test/mochitest.ini b/content/media/webaudio/test/mochitest.ini
index 7e7aaf1a1e0af..2ff0fe4c0f5e8 100644
--- a/content/media/webaudio/test/mochitest.ini
+++ b/content/media/webaudio/test/mochitest.ini
@@ -1,5 +1,5 @@
 [DEFAULT]
-skip-if = ((buildapp == 'mulet' || buildapp == 'b2g') && (toolkit != 'gonk' || debug)) #b2g-debug,b2g-desktop(bug 916135)
+skip-if = ((buildapp == 'mulet' || buildapp == 'b2g') && (toolkit != 'gonk' || debug)) || (os == 'win' && contentSandbox != 'off') #b2g-debug,b2g-desktop(bug 916135); contentSandbox(Bug 1042735)
 support-files =
   audio-expected.wav
   audio-mono-expected-2.wav
diff --git a/dom/media/tests/mochitest/mochitest.ini b/dom/media/tests/mochitest/mochitest.ini
index 30b8fa634b378..09870566e1a0d 100644
--- a/dom/media/tests/mochitest/mochitest.ini
+++ b/dom/media/tests/mochitest/mochitest.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = (os == 'win' && contentSandbox != 'off') # contentSandbox(Bug 1042735)
 support-files =
   head.js
   constraints.js