Bug 1103188 - Always check tracks on getUserMedia(). r=jib

dom/media/tests/mochitest/head.js

@@ -215,7 +215,8 @@ function createMediaElement(type, label) {
  */
 function getUserMedia(constraints) {
   info("Call getUserMedia for " + JSON.stringify(constraints));
-  return navigator.mediaDevices.getUserMedia(constraints);
+  return navigator.mediaDevices.getUserMedia(constraints)
+    .then(stream => (checkMediaStreamTracks(constraints, stream), stream));
 }
 
 // These are the promises we use to track that the prerequisites for the test

dom/media/tests/mochitest/test_getUserMedia_audioCapture.html

@@ -83,7 +83,6 @@ scriptsReady
     var constraints = {audio: {mediaSource: "audioCapture"}};
 
     return getUserMedia(constraints).then((stream) => {
-      checkMediaStreamTracks(constraints, stream);
       window.grip = stream;
       var analyser = new AudioStreamAnalyser(ac, stream);
       analyser.enableDebugCanvas();

dom/media/tests/mochitest/test_getUserMedia_basicAudio.html

@@ -16,8 +16,6 @@
     var constraints = {audio: true};
 
     return getUserMedia(constraints).then(stream => {
-      checkMediaStreamTracks(constraints, stream);
-
       var playback = new LocalMediaStreamPlayback(testAudio, stream);
       return playback.playMedia(false);
     });

dom/media/tests/mochitest/test_getUserMedia_basicScreenshare.html

@@ -30,8 +30,6 @@
     };
 
     return getUserMedia(constraints).then(stream => {
-      checkMediaStreamTracks(constraints, stream);
-
       var playback = new LocalMediaStreamPlayback(testVideo, stream);
       return playback.playMediaWithDeprecatedStreamStop(false);
     });

dom/media/tests/mochitest/test_getUserMedia_basicVideo.html

@@ -19,8 +19,6 @@
     var constraints = {video: true};
 
     return getUserMedia(constraints).then(stream => {
-      checkMediaStreamTracks(constraints, stream);
-
       var playback = new LocalMediaStreamPlayback(testVideo, stream);
       return playback.playMedia(false);
     });

dom/media/tests/mochitest/test_getUserMedia_basicVideoAudio.html

@@ -19,8 +19,6 @@
     var constraints = {video: true, audio: true};
 
     return getUserMedia(constraints).then(stream => {
-      checkMediaStreamTracks(constraints, stream);
-
       var playback = new LocalMediaStreamPlayback(testVideoAudio, stream);
       return playback.playMedia(false);
     });

dom/media/tests/mochitest/test_getUserMedia_basicVideo_playAfterLoadedmetadata.html

@@ -19,8 +19,6 @@
     var constraints = {video: true};
 
     return getUserMedia(constraints).then(stream => {
-      checkMediaStreamTracks(constraints, stream);
-
       var playback = new LocalMediaStreamPlayback(testVideo, stream);
       var video = playback.mediaElement;
 

dom/media/tests/mochitest/test_getUserMedia_basicWindowshare.html

@@ -30,8 +30,6 @@
     };
 
     return getUserMedia(constraints).then(stream => {
-      checkMediaStreamTracks(constraints, stream);
-
       var playback = new LocalMediaStreamPlayback(testVideo, stream);
       return playback.playMediaWithDeprecatedStreamStop(false);
     });