Revert of Revert of Re-enabling fixed WebRTC getusermedia tests.

content/browser/media/webrtc_getusermedia_browsertest.cc

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 bbfddf52edb70a29e30639a500336dc177099277..f8cf5557c363cb8c16d90ff34207999649e91f70 100644
--- a/content/browser/media/webrtc_getusermedia_browsertest.cc
+++ b/content/browser/media/webrtc_getusermedia_browsertest.cc
@@ -298,15 +298,8 @@
                           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_F(WebRtcGetUserMediaBrowserTest,
-                       MAYBE_GetAudioAndVideoStreamAndStop) {
+IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
+                       GetAudioAndVideoStreamAndStop) {
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
 
   GURL url(embedded_test_server()->GetURL("/media/getusermedia.html"));
@@ -439,16 +432,8 @@
       "twoGetUserMediaAndStop({video: true, audio: true});");
 }
 
-#if defined(OS_WIN) && !defined(NDEBUG)
-// Flaky on Webkit Win7 Debug bot: http://crbug.com/417756
-#define MAYBE_TwoGetUserMediaWithEqualConstraints \
-    DISABLED_TwoGetUserMediaWithEqualConstraints
-#else
-#define MAYBE_TwoGetUserMediaWithEqualConstraints \
-    TwoGetUserMediaWithEqualConstraints
-#endif
-IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
-                       MAYBE_TwoGetUserMediaWithEqualConstraints) {
+IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
+                       TwoGetUserMediaWithEqualConstraints) {
   std::string constraints1 = "{video: true, audio: true}";
   const std::string& constraints2 = constraints1;
   std::string expected_result = "w=640:h=480-w=640:h=480";
@@ -457,16 +442,8 @@
                                                   expected_result);
 }
 
-#if defined(OS_WIN)
-// Flaky on Windows Debug: http://crbug.com/417756
-#define MAYBE_TwoGetUserMediaWithSecondVideoCropped \
-    DISABLED_TwoGetUserMediaWithSecondVideoCropped
-#else
-#define MAYBE_TwoGetUserMediaWithSecondVideoCropped \
-    TwoGetUserMediaWithSecondVideoCropped
-#endif
-IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
-                       MAYBE_TwoGetUserMediaWithSecondVideoCropped) {
+IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
+                       TwoGetUserMediaWithSecondVideoCropped) {
   std::string constraints1 = "{video: true}";
   std::string constraints2 = "{video: {mandatory: {maxHeight: 360}}}";
   std::string expected_result = "w=640:h=480-w=640:h=360";
@@ -474,16 +451,8 @@
                                                   expected_result);
 }
 
-#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(NDEBUG))
-// Flaky on Windows and on Linux Debug: http://crbug.com/417756
-#define MAYBE_TwoGetUserMediaWithFirstHdSecondVga \
-    DISABLED_TwoGetUserMediaWithFirstHdSecondVga
-#else
-#define MAYBE_TwoGetUserMediaWithFirstHdSecondVga \
-    TwoGetUserMediaWithFirstHdSecondVga
-#endif
-IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
-                       MAYBE_TwoGetUserMediaWithFirstHdSecondVga) {
+IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
+                       TwoGetUserMediaWithFirstHdSecondVga) {
   std::string constraints1 =
       "{video: {mandatory: {minWidth:1280 , minHeight: 720}}}";
   std::string constraints2 =