From b225701ee695b4dce9d6875c1b8803d9bc856055 Mon Sep 17 00:00:00 2001
From: Andreas Pehrson <apehrson@mozilla.com>
Date: Mon, 1 Jul 2019 09:54:26 +0000
Subject: [PATCH] Bug 1556710 - Make MediaRecorder tests that are using gUM run
 in Firefox. r=jib

Depends on D33762

Differential Revision: https://phabricator.services.mozilla.com/D33763

--HG--
rename : testing/web-platform/meta/mediacapture-streams/__dir__.ini => testing/web-platform/meta/mediacapture-record/__dir__.ini
extra : moz-landing-system : lando
---
 testing/web-platform/meta/mediacapture-record/__dir__.ini       | 1 +
 .../tests/mediacapture-record/MediaRecorder-creation.https.html | 2 +-
 .../MediaRecorder-disabled-tracks.https.html                    | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 testing/web-platform/meta/mediacapture-record/__dir__.ini

diff --git a/testing/web-platform/meta/mediacapture-record/__dir__.ini b/testing/web-platform/meta/mediacapture-record/__dir__.ini
new file mode 100644
index 000000000000..fcfb216d298b
--- /dev/null
+++ b/testing/web-platform/meta/mediacapture-record/__dir__.ini
@@ -0,0 +1 @@
+prefs: [media.navigator.permission.disabled:true, media.navigator.streams.fake:true, media.devices.insecure.enabled:false, dom.security.featurePolicy.enabled:true, dom.security.featurePolicy.header.enabled:true, dom.security.featurePolicy.webidl.enabled:true]
diff --git a/testing/web-platform/tests/mediacapture-record/MediaRecorder-creation.https.html b/testing/web-platform/tests/mediacapture-record/MediaRecorder-creation.https.html
index 57e636c69846..419211c9dcf6 100644
--- a/testing/web-platform/tests/mediacapture-record/MediaRecorder-creation.https.html
+++ b/testing/web-platform/tests/mediacapture-record/MediaRecorder-creation.https.html
@@ -26,7 +26,7 @@
       });
 
       const onError = test.unreached_func('Error creating MediaStream.');
-      navigator.getUserMedia(constraints, gotStream, onError);
+      navigator.mediaDevices.getUserMedia(constraints).then(gotStream, onError);
     }, message);
   }
 
diff --git a/testing/web-platform/tests/mediacapture-record/MediaRecorder-disabled-tracks.https.html b/testing/web-platform/tests/mediacapture-record/MediaRecorder-disabled-tracks.https.html
index fe26e0c9616a..52e0010cfef0 100644
--- a/testing/web-platform/tests/mediacapture-record/MediaRecorder-disabled-tracks.https.html
+++ b/testing/web-platform/tests/mediacapture-record/MediaRecorder-disabled-tracks.https.html
@@ -46,7 +46,7 @@
       });
 
       const onError = test.unreached_func('Error creating MediaStream.');
-      navigator.getUserMedia(args[1], gotStream, onError);
+      navigator.mediaDevices.getUserMedia(args[1]).then(gotStream, onError);
     }, args[0]);
   });