| Index: content/test/data/media/getusermedia.html
|
| diff --git a/content/test/data/media/getusermedia.html b/content/test/data/media/getusermedia.html
|
| index 4867a5dcdd71be9bc58568e296f395b357c0a65e..fef58b76f3f8eedc8d4b9517d6548e95172fb358 100644
|
| --- a/content/test/data/media/getusermedia.html
|
| +++ b/content/test/data/media/getusermedia.html
|
| @@ -13,8 +13,8 @@
|
| reportTestSuccess();
|
| });
|
|
|
| - function getMediaDevices() {
|
| - navigator.getMediaDevices(function(devices) {
|
| + function getSources() {
|
| + MediaStreamTrack.getSources(function(devices) {
|
| document.title = 'Media devices available';
|
| sendValueToTest(JSON.stringify(devices));
|
| });
|
| @@ -220,7 +220,7 @@
|
| }
|
| }
|
|
|
| - // Calls GetUserMedia twice and verify that the frame rate is as expected for
|
| + // Calls GetUserMedia twice and verify that the frame rate is as expected for
|
| // both streams.
|
| function twoGetUserMediaAndVerifyFrameRate(constraints1,
|
| constraints2,
|
| @@ -239,7 +239,7 @@
|
| function(stream) {
|
| requestSecondGetUserMedia();
|
| plugStreamIntoVideoElement(stream, 'local-view');
|
| - detectVideoPlaying('local-view',
|
| + detectVideoPlaying('local-view',
|
| function() {
|
| validateFrameRate('local-view', expected_frame_rate1,
|
| validateFrameRateCallback);
|
| @@ -251,7 +251,7 @@
|
| constraints2,
|
| function(stream) {
|
| plugStreamIntoVideoElement(stream, 'local-view-2');
|
| - detectVideoPlaying('local-view-2',
|
| + detectVideoPlaying('local-view-2',
|
| function() {
|
| validateFrameRate('local-view-2', expected_frame_rate2,
|
| validateFrameRateCallback);
|
|
|