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) |
|
mcasas
2015/12/11 00:08:56
Can we enable this now?
cpaulin (no longer in chrome)
2015/12/11 19:56:55
I wanted to do it in a separate CL so that if it f
| |
| 13 // TODO(cpaulin): when crbug.com/561068 is fixed, enable this test | 13 // TODO(cpaulin): when crbug.com/561068 is fixed, enable this test |
| 14 // on android platform. | 14 // on android platform. |
| 15 #define MAYBE_WebRtcMediaRecorderTest DISABLED_WebRtcMediaRecorderTest | 15 #define MAYBE_WebRtcMediaRecorderTest DISABLED_WebRtcMediaRecorderTest |
| 16 #else | 16 #else |
| 17 #define MAYBE_WebRtcMediaRecorderTest WebRtcMediaRecorderTest | 17 #define MAYBE_WebRtcMediaRecorderTest WebRtcMediaRecorderTest |
| 18 #endif | 18 #endif |
| 19 | 19 |
| 20 namespace { | 20 namespace { |
| 21 | 21 |
| 22 // Blink features necessary to run the test. | 22 // Blink features necessary to run the test. |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 57 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest, | 57 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest, |
| 58 MediaRecorderStartAndStop) { | 58 MediaRecorderStartAndStop) { |
| 59 MakeTypicalCall("testStartStopAndRecorderState();", kMediaRecorderHtmlFile); | 59 MakeTypicalCall("testStartStopAndRecorderState();", kMediaRecorderHtmlFile); |
| 60 } | 60 } |
| 61 | 61 |
| 62 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest, | 62 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest, |
| 63 MediaRecorderStartAndDataAvailable) { | 63 MediaRecorderStartAndDataAvailable) { |
| 64 MakeTypicalCall("testStartAndDataAvailable();", kMediaRecorderHtmlFile); | 64 MakeTypicalCall("testStartAndDataAvailable();", kMediaRecorderHtmlFile); |
| 65 } | 65 } |
| 66 | 66 |
| 67 // Fails flakily under ThreadSanitizer, http://crbug.com/562406. | |
| 68 #if defined(THREAD_SANITIZER) | |
| 69 #define MAYBE_MediaRecorderStartWithTimeSlice DISABLED_MediaRecorderStartWithTim eSlice | |
| 70 #else | |
| 71 #define MAYBE_MediaRecorderStartWithTimeSlice MediaRecorderStartWithTimeSlice | |
| 72 #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
| |
| 73 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest, | 67 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest, |
| 74 MAYBE_MediaRecorderStartWithTimeSlice) { | 68 MediaRecorderStartWithTimeSlice) { |
| 75 MakeTypicalCall("testStartWithTimeSlice();", kMediaRecorderHtmlFile); | 69 MakeTypicalCall("testStartWithTimeSlice();", kMediaRecorderHtmlFile); |
| 76 } | 70 } |
| 77 | 71 |
| 78 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest, MediaRecorderStartEvent) { | 72 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest, MediaRecorderStartEvent) { |
| 79 MakeTypicalCall("testStartAndStartEventTriggered();", kMediaRecorderHtmlFile); | 73 MakeTypicalCall("testStartAndStartEventTriggered();", kMediaRecorderHtmlFile); |
| 80 } | 74 } |
| 81 | 75 |
| 82 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest, | 76 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest, |
| 83 MediaRecorderStopEvent) { | 77 MediaRecorderStopEvent) { |
| 84 MakeTypicalCall("testStartStopAndStopEventTriggered();", | 78 MakeTypicalCall("testStartStopAndStopEventTriggered();", |
| (...skipping 14 matching lines...) Expand all Loading... | |
| 99 MediaRecorderNoResumeWhenRecorderInactive) { | 93 MediaRecorderNoResumeWhenRecorderInactive) { |
| 100 MakeTypicalCall("testNoResumeWhileRecorderInactive();", | 94 MakeTypicalCall("testNoResumeWhileRecorderInactive();", |
| 101 kMediaRecorderHtmlFile); | 95 kMediaRecorderHtmlFile); |
| 102 } | 96 } |
| 103 | 97 |
| 104 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest, | 98 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest, |
| 105 MediaRecorderResumeAndDataAvailable) { | 99 MediaRecorderResumeAndDataAvailable) { |
| 106 MakeTypicalCall("testResumeAndDataAvailable();", kMediaRecorderHtmlFile); | 100 MakeTypicalCall("testResumeAndDataAvailable();", kMediaRecorderHtmlFile); |
| 107 } | 101 } |
| 108 | 102 |
| 103 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest, | |
| 104 MediaRecorderPause) { | |
| 105 MakeTypicalCall("testPauseAndRecorderState();", kMediaRecorderHtmlFile); | |
| 106 } | |
| 107 | |
| 108 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest, | |
| 109 MediaRecorderPauseStop) { | |
| 110 MakeTypicalCall("testPauseStopAndRecorderState();", kMediaRecorderHtmlFile); | |
| 111 } | |
| 112 | |
| 113 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest, | |
| 114 MediaRecorderPauseEvent) { | |
| 115 MakeTypicalCall("testPauseAndPauseEventTriggered();", kMediaRecorderHtmlFile); | |
| 116 } | |
| 117 | |
| 118 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest, | |
| 119 MediaRecorderPauseAndNoDataAvailable) { | |
| 120 MakeTypicalCall("testPauseAndNoDataAvailable();", kMediaRecorderHtmlFile); | |
| 121 } | |
| 122 | |
| 123 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest, | |
| 124 MediaRecorderNoPauseWhenRecorderInactive) { | |
| 125 MakeTypicalCall("testNoPauseWhileRecorderInactive();", | |
| 126 kMediaRecorderHtmlFile); | |
| 127 } | |
| 128 | |
| 109 } // namespace content | 129 } // namespace content |
| OLD | NEW |