| 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 071bf9caf4ee073402e776abaf772fdae5a44a86..2a512012b021e1603125c0f807d9534bbd6a1688 100644
|
| --- a/content/browser/webrtc/webrtc_media_recorder_browsertest.cc
|
| +++ b/content/browser/webrtc/webrtc_media_recorder_browsertest.cc
|
| @@ -73,7 +73,13 @@ IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, StartAndStop) {
|
| MakeTypicalCall("testStartStopAndRecorderState();", kMediaRecorderHtmlFile);
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_P(WebRtcMediaRecorderTest, StartAndDataAvailable) {
|
| +// 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) {
|
| MaybeForceDisableEncodeAccelerator(GetParam().disable_accelerator);
|
| MakeTypicalCall(base::StringPrintf("testStartAndDataAvailable(\"%s\");",
|
| GetParam().mime_type.c_str()),
|
| @@ -144,12 +150,27 @@ IN_PROC_BROWSER_TEST_P(WebRtcMediaRecorderTest, RecordWithTransparency) {
|
| kMediaRecorderHtmlFile);
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, IllegalStopThrowsDOMError) {
|
| +// 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) {
|
| 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,
|
| - IllegalStartWhileRecordingThrowsDOMError) {
|
| + MAYBE_IllegalStartWhileRecordingThrowsDOMError) {
|
| MakeTypicalCall("testIllegalStartInRecordingStateThrowsDOMError();",
|
| kMediaRecorderHtmlFile);
|
| }
|
|
|