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 434f381f1e541343a9d8422e9c247275744445e0..468982c7055f3979262f3187e3d3fb2da1d6aa8e 100644 |
--- a/content/browser/media/webrtc_media_recorder_browsertest.cc |
+++ b/content/browser/media/webrtc_media_recorder_browsertest.cc |
@@ -9,14 +9,16 @@ |
#include "content/test/webrtc_content_browsertest_base.h" |
#include "media/base/media_switches.h" |
-#if defined(OS_ANDROID) |
-// TODO(cpaulin): when crbug.com/561068 is fixed, enable this test |
mcasas
2015/12/14 23:48:49
I didn't mean to enable these tests for Android in
cpaulin (no longer in chrome)
2015/12/15 22:44:19
Acknowledged.
|
-// on android platform. |
+#if defined(OS_ANDROID) && defined(ADDRESS_SANITIZER) |
+// Renderer crashes under Android ASAN: https://crbug.com/408496. |
#define MAYBE_WebRtcMediaRecorderTest DISABLED_WebRtcMediaRecorderTest |
#else |
#define MAYBE_WebRtcMediaRecorderTest WebRtcMediaRecorderTest |
#endif |
+// crbug.com/568702: issue with stopping from paused state. |
+#define MAYBE_MediaRecorderPauseStop DISABLED_MediaRecorderPauseStop |
+ |
namespace { |
// Blink features necessary to run the test. |
@@ -100,4 +102,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, |
+ MAYBE_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 |