| Index: content/browser/media/webrtc_getusermedia_browsertest.cc
|
| diff --git a/content/browser/media/webrtc_getusermedia_browsertest.cc b/content/browser/media/webrtc_getusermedia_browsertest.cc
|
| index 8821d64f458ac2e53e5f538e02e86b63b89a544a..5812a64c7403569d2f2d7f2fb9fbb53d772b285e 100644
|
| --- a/content/browser/media/webrtc_getusermedia_browsertest.cc
|
| +++ b/content/browser/media/webrtc_getusermedia_browsertest.cc
|
| @@ -309,15 +309,8 @@ IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest,
|
| kRenderDuplicatedMediastreamAndStop));
|
| }
|
|
|
| -// Flaky on Android. http://crbug.com/387895
|
| -#if defined(OS_ANDROID)
|
| -#define MAYBE_GetAudioAndVideoStreamAndStop DISABLED_GetAudioAndVideoStreamAndStop
|
| -#else
|
| -#define MAYBE_GetAudioAndVideoStreamAndStop GetAudioAndVideoStreamAndStop
|
| -#endif
|
| -
|
| IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest,
|
| - MAYBE_GetAudioAndVideoStreamAndStop) {
|
| + GetAudioAndVideoStreamAndStop) {
|
| ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
|
|
|
| GURL url(embedded_test_server()->GetURL("/media/getusermedia.html"));
|
| @@ -627,7 +620,7 @@ static const UserMediaSizes kAllUserMediaSizes[] = {
|
| {960, 960, 720, 720, 10, 30},
|
| {1280, 1280, 720, 720, 10, 30}};
|
|
|
| -INSTANTIATE_TEST_CASE_P(UserMedia,
|
| +INSTANTIATE_TEST_CASE_P(WebRtcConstraintsBrowserTests,
|
| WebRtcConstraintsBrowserTest,
|
| testing::ValuesIn(kAllUserMediaSizes));
|
|
|
|
|