Revert of Revert of Re-enabling fixed WebRTC getusermedia tests. (patchset #1...

Revert of Revert of Re-enabling fixed WebRTC getusermedia tests. (patchset #1 id:1 of https://codereview.chromium.org/630143002/)

Reason for revert:
Should be fixed by https://codereview.chromium.org/638423002/ and https://codereview.chromium.org/640253002.

Original issue's description:
> Revert of Re-enabling fixed WebRTC getusermedia tests. (patchset #1 id:1 of https://codereview.chromium.org/623733002/)
>
> Reason for revert:
> still flaky, see bug
>
> Original issue's description:
> > Re-enabling fixed WebRTC getusermedia tests.
> >
> > BUG=417756
> >
> > Committed: https://crrev.com/9fa6d13fdbac6c82917c23c9b63b4f3cb7b7593e
> > Cr-Commit-Position: refs/heads/master@{#298205}
>
> TBR=perkj@chromium.org,kjellander@chromium.org,phoglund@chromium.org
> NOTREECHECKS=true
> NOTRY=true
> BUG=417756
>
> Committed: https://crrev.com/290d2cfa5187ac1f2c87fde4c6dd6f27dad0c93a
> Cr-Commit-Position: refs/heads/master@{#298262}

TBR=perkj@chromium.org,kjellander@chromium.org,jam@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=417756

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

Cr-Commit-Position: refs/heads/master@{#299078}

content/browser/media/webrtc_getusermedia_browsertest.cc

@@ -298,15 +298,8 @@ IN_PROC_BROWSER_TEST_F(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_F(WebRtcGetUserMediaBrowserTest,
-                       MAYBE_GetAudioAndVideoStreamAndStop) {
+                       GetAudioAndVideoStreamAndStop) {
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
 
   GURL url(embedded_test_server()->GetURL("/media/getusermedia.html"));
@@ -439,16 +432,8 @@ IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest, TwoGetUserMediaAndStop) {
       "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) {
+                       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 @@ IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
                                                   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) {
+                       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 @@ IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
                                                   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) {
+                       TwoGetUserMediaWithFirstHdSecondVga) {
   std::string constraints1 =
       "{video: {mandatory: {minWidth:1280 , minHeight: 720}}}";
   std::string constraints2 =