| 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 "base/macros.h" | 6 #include "base/macros.h" |
| 7 #include "base/strings/stringprintf.h" | 7 #include "base/strings/stringprintf.h" |
| 8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
| 9 #include "content/browser/webrtc/webrtc_content_browsertest_base.h" | 9 #include "content/browser/webrtc/webrtc_content_browsertest_base.h" |
| 10 #include "content/public/common/content_switches.h" | 10 #include "content/public/common/content_switches.h" |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 115 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, MAYBE_PauseStop) { | 115 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, MAYBE_PauseStop) { |
| 116 MakeTypicalCall("testPauseStopAndRecorderState();", kMediaRecorderHtmlFile); | 116 MakeTypicalCall("testPauseStopAndRecorderState();", kMediaRecorderHtmlFile); |
| 117 } | 117 } |
| 118 | 118 |
| 119 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, | 119 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, |
| 120 PausePreventsDataavailableFromBeingFired) { | 120 PausePreventsDataavailableFromBeingFired) { |
| 121 MakeTypicalCall("testPausePreventsDataavailableFromBeingFired();", | 121 MakeTypicalCall("testPausePreventsDataavailableFromBeingFired();", |
| 122 kMediaRecorderHtmlFile); | 122 kMediaRecorderHtmlFile); |
| 123 } | 123 } |
| 124 | 124 |
| 125 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, IllegalPauseThrowsDOMError) { | 125 // TODO (crbug.com/736268): Flaky on Linux TSan bots. |
| 126 #if defined(OS_LINUX) |
| 127 #define MAYBE_IllegalPauseThrowsDOMError DISABLED_IllegalPauseThrowsDOMError |
| 128 #else |
| 129 #define MAYBE_IllegalPauseThrowsDOMError IllegalPauseThrowsDOMError |
| 130 #endif |
| 131 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, |
| 132 MAYBE_IllegalPauseThrowsDOMError) { |
| 126 MakeTypicalCall("testIllegalPauseThrowsDOMError();", kMediaRecorderHtmlFile); | 133 MakeTypicalCall("testIllegalPauseThrowsDOMError();", kMediaRecorderHtmlFile); |
| 127 } | 134 } |
| 128 | 135 |
| 129 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, TwoChannelAudioRecording) { | 136 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, TwoChannelAudioRecording) { |
| 130 MakeTypicalCall("testTwoChannelAudio();", kMediaRecorderHtmlFile); | 137 MakeTypicalCall("testTwoChannelAudio();", kMediaRecorderHtmlFile); |
| 131 } | 138 } |
| 132 | 139 |
| 133 IN_PROC_BROWSER_TEST_P(WebRtcMediaRecorderTest, RecordWithTransparency) { | 140 IN_PROC_BROWSER_TEST_P(WebRtcMediaRecorderTest, RecordWithTransparency) { |
| 134 MaybeForceDisableEncodeAccelerator(GetParam().disable_accelerator); | 141 MaybeForceDisableEncodeAccelerator(GetParam().disable_accelerator); |
| 135 MakeTypicalCall(base::StringPrintf("testRecordWithTransparency(\"%s\");", | 142 MakeTypicalCall(base::StringPrintf("testRecordWithTransparency(\"%s\");", |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 197 RemovingTrackFromMediaStreamFiresErrorEvent) { | 204 RemovingTrackFromMediaStreamFiresErrorEvent) { |
| 198 MakeTypicalCall("testRemovingTrackFromMediaStreamFiresErrorEvent();", | 205 MakeTypicalCall("testRemovingTrackFromMediaStreamFiresErrorEvent();", |
| 199 kMediaRecorderHtmlFile); | 206 kMediaRecorderHtmlFile); |
| 200 } | 207 } |
| 201 | 208 |
| 202 INSTANTIATE_TEST_CASE_P(, | 209 INSTANTIATE_TEST_CASE_P(, |
| 203 WebRtcMediaRecorderTest, | 210 WebRtcMediaRecorderTest, |
| 204 testing::ValuesIn(kEncodingParameters)); | 211 testing::ValuesIn(kEncodingParameters)); |
| 205 | 212 |
| 206 } // namespace content | 213 } // namespace content |
| OLD | NEW |