From bea1db328892155789e584c87e8b2cb043b039af Mon Sep 17 00:00:00 2001
From: "phoglund@chromium.org"
 <phoglund@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 4 Jul 2014 13:06:08 +0000
Subject: [PATCH] Speculatively enabling most WebRTC browser tests.

BUG=387895
NOTRY=true

Review URL: https://codereview.chromium.org/369923007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@281402 0039d316-1c4b-4281-b951-d872f2087c98
---
 .../android/pylib/gtest/filter/content_browsertests_disabled  | 10 ++++++++--
 content/browser/media/webrtc_getusermedia_browsertest.cc      | 11 ++---------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/build/android/pylib/gtest/filter/content_browsertests_disabled b/build/android/pylib/gtest/filter/content_browsertests_disabled
index a135e2661782..b14bfc40daac 100644
--- a/build/android/pylib/gtest/filter/content_browsertests_disabled
+++ b/build/android/pylib/gtest/filter/content_browsertests_disabled
@@ -123,5 +123,11 @@ TracingControllerTest.EnableCaptureAndDisableMonitoringWithFilePath
 MSE_ClearKey/EncryptedMediaTest.ConfigChangeVideo/0
 
 # http://crbug.com/387895
-WebRtcBrowserTests/WebRtcBrowserTest*
-WebRtcGetUserMediaBrowserTests/WebRtcGetUserMediaBrowserTest*
+WebRtcBrowserTests/WebRtcBrowserTest.CallWithNewVideoMediaStream/*
+WebRtcBrowserTests/WebRtcBrowserTest.AddTwoMediaStreamsToOnePC/*
+WebRtcBrowserTests/WebRtcBrowserTest.TwoCallsWithAecDump/*
+WebRtcBrowserTests/WebRtcBrowserTest.EstablishAudioVideoCallAndVerifyMutingWorks/*
+WebRtcBrowserTests/WebRtcBrowserTest.EstablishAudioVideoCallAndVerifyUnmutingWorks/*
+WebRtcGetUserMediaBrowserTests/WebRtcGetUserMediaBrowserTest.GetUserMediaWithMandatorySourceID/*
+WebRtcGetUserMediaBrowserTests/WebRtcGetUserMediaBrowserTest.TwoGetUserMediaAndStop/*
+WebRtcGetUserMediaBrowserTests/WebRtcGetUserMediaBrowserTest.GetAudioAndVideoStreamAndStop/*
diff --git a/content/browser/media/webrtc_getusermedia_browsertest.cc b/content/browser/media/webrtc_getusermedia_browsertest.cc
index 8821d64f458a..5812a64c7403 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));
 
-- 
2.11.4.GIT