Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(654)

Unified Diff: content/browser/media/webrtc_getusermedia_browsertest.cc

Issue 371473002: Speculatively re-enabling all WebRTC content browser tests on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/android/pylib/gtest/filter/content_browsertests_disabled ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 709801bb9f24a77260cdeb32a25d16277b790ed3..c5573419aadf66ca4ac45a89cbb6dc4e8b59403a 100644
--- a/content/browser/media/webrtc_getusermedia_browsertest.cc
+++ b/content/browser/media/webrtc_getusermedia_browsertest.cc
@@ -311,15 +311,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"));
@@ -629,7 +622,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));
« no previous file with comments | « build/android/pylib/gtest/filter/content_browsertests_disabled ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698