diff options
4 files changed, 23 insertions, 17 deletions
diff --git a/chrome/browser/media/chrome_webrtc_getmediadevices_browsertest.cc b/chrome/browser/media/chrome_webrtc_getmediadevices_browsertest.cc index f7e7987..00e347e 100644 --- a/chrome/browser/media/chrome_webrtc_getmediadevices_browsertest.cc +++ b/chrome/browser/media/chrome_webrtc_getmediadevices_browsertest.cc @@ -181,8 +181,10 @@ INSTANTIATE_TEST_CASE_P(WebRtcGetMediaDevicesBrowserTests, WebRtcGetMediaDevicesBrowserTest, testing::ValuesIn(kParamsToRunTestsWith)); +// getMediaDevices has been removed and will be replaced +// MediaDevices.enumerateDevices. http://crbug.com/388648. IN_PROC_BROWSER_TEST_P(WebRtcGetMediaDevicesBrowserTest, - GetMediaDevicesWithoutAccess) { + DISABLED_GetMediaDevicesWithoutAccess) { ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); GURL url(embedded_test_server()->GetURL(kMainWebrtcTestHtmlPage)); ui_test_utils::NavigateToURL(browser(), url); @@ -199,6 +201,8 @@ IN_PROC_BROWSER_TEST_P(WebRtcGetMediaDevicesBrowserTest, } } +// getMediaDevices has been removed and will be replaced +// MediaDevices.enumerateDevices. http://crbug.com/388648. // Disabled, fails due to http://crbug.com/382391. IN_PROC_BROWSER_TEST_P(WebRtcGetMediaDevicesBrowserTest, DISABLED_GetMediaDevicesWithAccess) { @@ -220,8 +224,10 @@ IN_PROC_BROWSER_TEST_P(WebRtcGetMediaDevicesBrowserTest, } } +// getMediaDevices has been removed and will be replaced +// MediaDevices.enumerateDevices. http://crbug.com/388648. IN_PROC_BROWSER_TEST_P(WebRtcGetMediaDevicesBrowserTest, - GetMediaDevicesEqualsGetSourcesWithoutAccess) { + DISABLED_GetMediaDevicesEqualsGetSourcesWithoutAccess) { ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); GURL url(embedded_test_server()->GetURL(kMainWebrtcTestHtmlPage)); ui_test_utils::NavigateToURL(browser(), url); @@ -252,6 +258,8 @@ IN_PROC_BROWSER_TEST_P(WebRtcGetMediaDevicesBrowserTest, EXPECT_EQ(sources.end(), sources_it); } +// getMediaDevices has been removed and will be replaced +// MediaDevices.enumerateDevices. http://crbug.com/388648. // Disabled, fails due to http://crbug.com/382391. IN_PROC_BROWSER_TEST_P(WebRtcGetMediaDevicesBrowserTest, DISABLED_GetMediaDevicesEqualsGetSourcesWithAccess) { diff --git a/chrome/test/data/webrtc/media_devices.js b/chrome/test/data/webrtc/media_devices.js index 9a0dfb2..356184e 100644 --- a/chrome/test/data/webrtc/media_devices.js +++ b/chrome/test/data/webrtc/media_devices.js @@ -29,7 +29,7 @@ function getSources() { /** * Queries for video input devices on the current system using the - * getMediaDevices API. + * getSources API. * * This does not guarantee that a getUserMedia with video will succeed, as the * camera could be busy for instance. @@ -38,10 +38,10 @@ function getSources() { * no-video-input-devices otherwise. */ function hasVideoInputDeviceOnSystem() { - navigator.getMediaDevices(function(devices) { + MediaStreamTrack.getSources(function(devices) { var hasVideoInputDevice = false; devices.forEach(function(device) { - if (device.kind == 'videoinput') + if (device.kind == 'video') hasVideoInputDevice = true; }); diff --git a/content/browser/media/webrtc_getusermedia_browsertest.cc b/content/browser/media/webrtc_getusermedia_browsertest.cc index 709801b..8821d64f 100644 --- a/content/browser/media/webrtc_getusermedia_browsertest.cc +++ b/content/browser/media/webrtc_getusermedia_browsertest.cc @@ -199,7 +199,7 @@ class WebRtcGetUserMediaBrowserTest: public WebRtcContentBrowserTest, NavigateToURL(shell(), url); std::string devices_as_json = ExecuteJavascriptAndReturnResult( - "getMediaDevices()"); + "getSources()"); EXPECT_FALSE(devices_as_json.empty()); int error_code; @@ -223,16 +223,14 @@ class WebRtcGetUserMediaBrowserTest: public WebRtcContentBrowserTest, std::string device_id; ASSERT_TRUE((*it)->GetAsDictionary(&dict)); ASSERT_TRUE(dict->GetString("kind", &kind)); - ASSERT_TRUE(dict->GetString("deviceId", &device_id)); + ASSERT_TRUE(dict->GetString("id", &device_id)); ASSERT_FALSE(device_id.empty()); - EXPECT_TRUE(kind == "audioinput" || kind == "videoinput" || - kind == "audiooutput"); - if (kind == "audioinput") { + EXPECT_TRUE(kind == "audio" || kind == "video"); + if (kind == "audio") { audio_ids->push_back(device_id); - } else if (kind == "videoinput") { + } else if (kind == "video") { video_ids->push_back(device_id); } - // We ignore audio output. } ASSERT_FALSE(audio_ids->empty()); ASSERT_FALSE(video_ids->empty()); diff --git a/content/test/data/media/getusermedia.html b/content/test/data/media/getusermedia.html index 4867a5d..fef58b7 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); |