Chromium Code Reviews| Index: content/browser/webrtc/webrtc_getusermedia_browsertest.cc |
| diff --git a/content/browser/webrtc/webrtc_getusermedia_browsertest.cc b/content/browser/webrtc/webrtc_getusermedia_browsertest.cc |
| index 33e294510546c2c6512cf7824fdd871b3af6f8a6..10cbd91e1770bd9b130e64fba8c2fa71275e34ab 100644 |
| --- a/content/browser/webrtc/webrtc_getusermedia_browsertest.cc |
| +++ b/content/browser/webrtc/webrtc_getusermedia_browsertest.cc |
| @@ -50,6 +50,8 @@ static const char kRenderClonedTrackMediastreamAndStop[] = |
| "renderClonedTrackMediastreamAndStop"; |
| static const char kRenderDuplicatedMediastreamAndStop[] = |
| "renderDuplicatedMediastreamAndStop"; |
| +static const char kGetDepthStreamAndCallCreateImageBitmap[] = |
| + "getDepthStreamAndCallCreateImageBitmap"; |
| // Results returned by JS. |
| static const char kOK[] = "OK"; |
| @@ -343,6 +345,27 @@ IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest, |
| kRenderDuplicatedMediastreamAndStop)); |
| } |
| +#if defined(OS_ANDROID) |
| +// TODO(astojilj): Support 16bpp depth video capture on Android. |
| +// This test assumes there is fake 16 bit depth capture device that is not |
| +// yet enabled on Android. |
|
mcasas
2016/10/21 00:10:50
TODO()s should have a https://crbug.com/123123 ass
aleksandar.stojiljkovic
2016/10/21 22:11:10
Done. Removed the special handling in fake_video_c
|
| +#define MAYBE_GetDepthStreamAndCallCreateImageBitmap \ |
| + DISABLED_GetDepthStreamAndCallCreateImageBitmap |
| +#else |
| +#define MAYBE_GetDepthStreamAndCallCreateImageBitmap \ |
| + GetDepthStreamAndCallCreateImageBitmap |
| +#endif |
| +IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest, |
| + MAYBE_GetDepthStreamAndCallCreateImageBitmap) { |
| + ASSERT_TRUE(embedded_test_server()->Start()); |
| + |
| + GURL url(embedded_test_server()->GetURL("/media/getusermedia.html")); |
| + NavigateToURL(shell(), url); |
| + |
| + ExecuteJavascriptAndWaitForOk(base::StringPrintf( |
| + "%s({video: true});", kGetDepthStreamAndCallCreateImageBitmap)); |
| +} |
| + |
| IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest, |
| GetAudioAndVideoStreamAndStop) { |
| ASSERT_TRUE(embedded_test_server()->Start()); |