Index: content/browser/media/webrtc_media_recorder_browsertest.cc |
diff --git a/content/browser/media/webrtc_media_recorder_browsertest.cc b/content/browser/media/webrtc_media_recorder_browsertest.cc |
index 3cf09ddc47db2e7bd6856cd96a27773d90e1ecf1..fb1dd9cadfc455fba2bba51ac0dd6df0a4418623 100644 |
--- a/content/browser/media/webrtc_media_recorder_browsertest.cc |
+++ b/content/browser/media/webrtc_media_recorder_browsertest.cc |
@@ -64,14 +64,8 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest, |
MakeTypicalCall("testStartAndDataAvailable();", kMediaRecorderHtmlFile); |
} |
-// Fails flakily under ThreadSanitizer, http://crbug.com/562406. |
-#if defined(THREAD_SANITIZER) |
-#define MAYBE_MediaRecorderStartWithTimeSlice DISABLED_MediaRecorderStartWithTimeSlice |
-#else |
-#define MAYBE_MediaRecorderStartWithTimeSlice MediaRecorderStartWithTimeSlice |
-#endif |
mcasas
2015/12/11 00:08:56
Hmm all this seems to be dragging from
https://co
cpaulin (no longer in chrome)
2015/12/11 19:56:55
Yes, I took it out
|
IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest, |
- MAYBE_MediaRecorderStartWithTimeSlice) { |
+ MediaRecorderStartWithTimeSlice) { |
MakeTypicalCall("testStartWithTimeSlice();", kMediaRecorderHtmlFile); |
} |
@@ -106,4 +100,30 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest, |
MakeTypicalCall("testResumeAndDataAvailable();", kMediaRecorderHtmlFile); |
} |
+IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest, |
+ MediaRecorderPause) { |
+ MakeTypicalCall("testPauseAndRecorderState();", kMediaRecorderHtmlFile); |
+} |
+ |
+IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest, |
+ MediaRecorderPauseStop) { |
+ MakeTypicalCall("testPauseStopAndRecorderState();", kMediaRecorderHtmlFile); |
+} |
+ |
+IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest, |
+ MediaRecorderPauseEvent) { |
+ MakeTypicalCall("testPauseAndPauseEventTriggered();", kMediaRecorderHtmlFile); |
+} |
+ |
+IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest, |
+ MediaRecorderPauseAndNoDataAvailable) { |
+ MakeTypicalCall("testPauseAndNoDataAvailable();", kMediaRecorderHtmlFile); |
+} |
+ |
+IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest, |
+ MediaRecorderNoPauseWhenRecorderInactive) { |
+ MakeTypicalCall("testNoPauseWhileRecorderInactive();", |
+ kMediaRecorderHtmlFile); |
+} |
+ |
} // namespace content |