Revert 281402 "Speculatively enabling most WebRTC browser tests."

> Speculatively enabling most WebRTC browser tests.
> 
> BUG=387895
> NOTRY=true
> 
> Review URL: https://codereview.chromium.org/369923007

TBR=phoglund@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282587 0039d316-1c4b-4281-b951-d872f2087c98

build/android/pylib/gtest/filter/content_browsertests_disabled

@@ -123,11 +123,5 @@ TracingControllerTest.EnableCaptureAndDisableMonitoringWithFilePath
 MSE_ClearKey/EncryptedMediaTest.ConfigChangeVideo/0
 
 # http://crbug.com/387895
-WebRtcBrowserTests/WebRtcBrowserTest.CallWithNewVideoMediaStream/*
-WebRtcBrowserTests/WebRtcBrowserTest.AddTwoMediaStreamsToOnePC/*
-WebRtcBrowserTests/WebRtcBrowserTest.TwoCallsWithAecDump/*
-WebRtcBrowserTests/WebRtcBrowserTest.EstablishAudioVideoCallAndVerifyMutingWorks/*
-WebRtcBrowserTests/WebRtcBrowserTest.EstablishAudioVideoCallAndVerifyUnmutingWorks/*
-WebRtcGetUserMediaBrowserTests/WebRtcGetUserMediaBrowserTest.GetUserMediaWithMandatorySourceID/*
-WebRtcGetUserMediaBrowserTests/WebRtcGetUserMediaBrowserTest.TwoGetUserMediaAndStop/*
-WebRtcGetUserMediaBrowserTests/WebRtcGetUserMediaBrowserTest.GetAudioAndVideoStreamAndStop/*
+WebRtcBrowserTests/WebRtcBrowserTest*
+WebRtcGetUserMediaBrowserTests/WebRtcGetUserMediaBrowserTest*

content/browser/media/webrtc_getusermedia_browsertest.cc

@@ -309,8 +309,15 @@ 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,
-                       GetAudioAndVideoStreamAndStop) {
+                       MAYBE_GetAudioAndVideoStreamAndStop) {
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
 
   GURL url(embedded_test_server()->GetURL("/media/getusermedia.html"));
@@ -620,7 +627,7 @@ static const UserMediaSizes kAllUserMediaSizes[] = {
     {960, 960, 720, 720, 10, 30},
     {1280, 1280, 720, 720, 10, 30}};
 
-INSTANTIATE_TEST_CASE_P(WebRtcConstraintsBrowserTests,
+INSTANTIATE_TEST_CASE_P(UserMedia,
                         WebRtcConstraintsBrowserTest,
                         testing::ValuesIn(kAllUserMediaSizes));