| Index: content/browser/webrtc/webrtc_media_recorder_browsertest.cc
|
| diff --git a/content/browser/webrtc/webrtc_media_recorder_browsertest.cc b/content/browser/webrtc/webrtc_media_recorder_browsertest.cc
|
| index 2a512012b021e1603125c0f807d9534bbd6a1688..071bf9caf4ee073402e776abaf772fdae5a44a86 100644
|
| --- a/content/browser/webrtc/webrtc_media_recorder_browsertest.cc
|
| +++ b/content/browser/webrtc/webrtc_media_recorder_browsertest.cc
|
| @@ -73,13 +73,7 @@
|
| 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()),
|
| @@ -150,27 +144,12 @@
|
| 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) {
|
| +IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest,
|
| + IllegalStartWhileRecordingThrowsDOMError) {
|
| MakeTypicalCall("testIllegalStartInRecordingStateThrowsDOMError();",
|
| kMediaRecorderHtmlFile);
|
| }
|
|
|