Revert of Disable flaky WebRtcMediaRecorderTest tests on TSAN

content/browser/webrtc/webrtc_media_recorder_browsertest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "content/browser/webrtc/webrtc_content_browsertest_base.h"
 #include "content/public/common/content_switches.h"
@@ skipping 55 matching lines @@
 };
 
 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, Start) {
   MakeTypicalCall("testStartAndRecorderState();", kMediaRecorderHtmlFile);
 }
 
 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, StartAndStop) {
   MakeTypicalCall("testStartStopAndRecorderState();", kMediaRecorderHtmlFile);
 }
 
-// Flaky on Linux Tsan (crbug.com/736268)
-#if defined(THREAD_SANITIZER)
-#define MAYBE_StartAndDataAvailable DISABLED_StartAndDataAvailable
-#else
-#define MAYBE_StartAndDataAvailable StartAndDataAvailable
-#endif
-IN_PROC_BROWSER_TEST_P(WebRtcMediaRecorderTest, MAYBE_StartAndDataAvailable) {
+IN_PROC_BROWSER_TEST_P(WebRtcMediaRecorderTest, StartAndDataAvailable) {
   MaybeForceDisableEncodeAccelerator(GetParam().disable_accelerator);
   MakeTypicalCall(base::StringPrintf("testStartAndDataAvailable(\"%s\");",
                                      GetParam().mime_type.c_str()),
                   kMediaRecorderHtmlFile);
 }
 
 IN_PROC_BROWSER_TEST_P(WebRtcMediaRecorderTest, StartWithTimeSlice) {
   MaybeForceDisableEncodeAccelerator(GetParam().disable_accelerator);
   MakeTypicalCall(base::StringPrintf("testStartWithTimeSlice(\"%s\");",
                                      GetParam().mime_type.c_str()),
@@ skipping 50 matching lines @@
   MakeTypicalCall("testTwoChannelAudio();", kMediaRecorderHtmlFile);
 }
 
 IN_PROC_BROWSER_TEST_P(WebRtcMediaRecorderTest, RecordWithTransparency) {
   MaybeForceDisableEncodeAccelerator(GetParam().disable_accelerator);
   MakeTypicalCall(base::StringPrintf("testRecordWithTransparency(\"%s\");",
                                      GetParam().mime_type.c_str()),
                   kMediaRecorderHtmlFile);
 }
 
-// Flaky on Linux Tsan (crbug.com/736268)
-#if defined(THREAD_SANITIZER)
-#define MAYBE_IllegalStopThrowsDOMError DISABLED_IllegalStopThrowsDOMError
-#else
-#define MAYBE_IllegalStopThrowsDOMError IllegalStopThrowsDOMError
-#endif
-IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest,
-                       MAYBE_IllegalStopThrowsDOMError) {
+IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, IllegalStopThrowsDOMError) {
   MakeTypicalCall("testIllegalStopThrowsDOMError();", kMediaRecorderHtmlFile);
 }
 
-// Flaky on Linux Tsan (crbug.com/736268)
-#if defined(THREAD_SANITIZER)
-#define MAYBE_IllegalStartWhileRecordingThrowsDOMError \
-  DISABLED_IllegalStartWhileRecordingThrowsDOMError
-#else
-#define MAYBE_IllegalStartWhileRecordingThrowsDOMError \
-  IllegalStartWhileRecordingThrowsDOMError
-#endif
 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest,
-                       MAYBE_IllegalStartWhileRecordingThrowsDOMError) {
+                       IllegalStartWhileRecordingThrowsDOMError) {
   MakeTypicalCall("testIllegalStartInRecordingStateThrowsDOMError();",
                   kMediaRecorderHtmlFile);
 }
 
 // Flaky on Linux Tsan (crbug.com/736268)
 #if defined(THREAD_SANITIZER)
 #define MAYBE_IllegalStartWhilePausedThrowsDOMError \
   DISABLED_IllegalStartWhilePausedThrowsDOMError
 #else
 #define MAYBE_IllegalStartWhilePausedThrowsDOMError \
@@ skipping 57 matching lines @@
                        RemovingTrackFromMediaStreamFiresErrorEvent) {
   MakeTypicalCall("testRemovingTrackFromMediaStreamFiresErrorEvent();",
                   kMediaRecorderHtmlFile);
 }
 
 INSTANTIATE_TEST_CASE_P(,
                         WebRtcMediaRecorderTest,
                         testing::ValuesIn(kEncodingParameters));
 
 }  // namespace content