Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "content/public/common/content_switches.h" | 6 #include "content/public/common/content_switches.h" |
| 7 #include "content/public/test/browser_test_utils.h" | 7 #include "content/public/test/browser_test_utils.h" |
| 8 #include "content/public/test/content_browser_test_utils.h" | 8 #include "content/public/test/content_browser_test_utils.h" |
| 9 #include "content/test/webrtc_content_browsertest_base.h" | 9 #include "content/test/webrtc_content_browsertest_base.h" |
| 10 #include "media/base/media_switches.h" | 10 #include "media/base/media_switches.h" |
| 11 | 11 |
| 12 #if defined(OS_ANDROID) | 12 #if defined(OS_ANDROID) && defined(ADDRESS_SANITIZER) |
| 13 // TODO(cpaulin): when crbug.com/561068 is fixed, enable this test | 13 // Renderer crashes under Android ASAN: https://crbug.com/408496. |
|
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.
| |
| 14 // on android platform. | |
| 15 #define MAYBE_WebRtcMediaRecorderTest DISABLED_WebRtcMediaRecorderTest | 14 #define MAYBE_WebRtcMediaRecorderTest DISABLED_WebRtcMediaRecorderTest |
| 16 #else | 15 #else |
| 17 #define MAYBE_WebRtcMediaRecorderTest WebRtcMediaRecorderTest | 16 #define MAYBE_WebRtcMediaRecorderTest WebRtcMediaRecorderTest |
| 18 #endif | 17 #endif |
| 19 | 18 |
| 19 // crbug.com/568702: issue with stopping from paused state. | |
| 20 #define MAYBE_MediaRecorderPauseStop DISABLED_MediaRecorderPauseStop | |
| 21 | |
| 20 namespace { | 22 namespace { |
| 21 | 23 |
| 22 // Blink features necessary to run the test. | 24 // Blink features necessary to run the test. |
| 23 static const char kBlinkFeaturesNeeded[] = "GetUserMedia,MediaRecorder"; | 25 static const char kBlinkFeaturesNeeded[] = "GetUserMedia,MediaRecorder"; |
| 24 | 26 |
| 25 static const char kMediaRecorderHtmlFile[] = "/media/mediarecorder_test.html"; | 27 static const char kMediaRecorderHtmlFile[] = "/media/mediarecorder_test.html"; |
| 26 | 28 |
| 27 } // namespace | 29 } // namespace |
| 28 | 30 |
| 29 namespace content { | 31 namespace content { |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 93 MediaRecorderNoResumeWhenRecorderInactive) { | 95 MediaRecorderNoResumeWhenRecorderInactive) { |
| 94 MakeTypicalCall("testNoResumeWhileRecorderInactive();", | 96 MakeTypicalCall("testNoResumeWhileRecorderInactive();", |
| 95 kMediaRecorderHtmlFile); | 97 kMediaRecorderHtmlFile); |
| 96 } | 98 } |
| 97 | 99 |
| 98 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest, | 100 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest, |
| 99 MediaRecorderResumeAndDataAvailable) { | 101 MediaRecorderResumeAndDataAvailable) { |
| 100 MakeTypicalCall("testResumeAndDataAvailable();", kMediaRecorderHtmlFile); | 102 MakeTypicalCall("testResumeAndDataAvailable();", kMediaRecorderHtmlFile); |
| 101 } | 103 } |
| 102 | 104 |
| 105 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest, | |
| 106 MediaRecorderPause) { | |
| 107 MakeTypicalCall("testPauseAndRecorderState();", kMediaRecorderHtmlFile); | |
| 108 } | |
| 109 | |
| 110 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest, | |
| 111 MAYBE_MediaRecorderPauseStop) { | |
| 112 MakeTypicalCall("testPauseStopAndRecorderState();", kMediaRecorderHtmlFile); | |
| 113 } | |
| 114 | |
| 115 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest, | |
| 116 MediaRecorderPauseEvent) { | |
| 117 MakeTypicalCall("testPauseAndPauseEventTriggered();", kMediaRecorderHtmlFile); | |
| 118 } | |
| 119 | |
| 120 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest, | |
| 121 MediaRecorderPauseAndNoDataAvailable) { | |
| 122 MakeTypicalCall("testPauseAndNoDataAvailable();", kMediaRecorderHtmlFile); | |
| 123 } | |
| 124 | |
| 125 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest, | |
| 126 MediaRecorderNoPauseWhenRecorderInactive) { | |
| 127 MakeTypicalCall("testNoPauseWhileRecorderInactive();", | |
| 128 kMediaRecorderHtmlFile); | |
| 129 } | |
| 130 | |
| 103 } // namespace content | 131 } // namespace content |
| OLD | NEW |