Revert 281326 "Speculatively re-enabling all WebRTC content brow..."

trunk/src/content/browser/media/webrtc_getusermedia_browsertest.cc

Index: trunk/src/content/browser/media/webrtc_getusermedia_browsertest.cc
===================================================================
--- trunk/src/content/browser/media/webrtc_getusermedia_browsertest.cc	(revision 281336)
+++ trunk/src/content/browser/media/webrtc_getusermedia_browsertest.cc	(working copy)
@@ -309,8 +309,15 @@
                           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 @@
     {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));