| 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 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 117 } | 117 } |
| 118 | 118 |
| 119 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, IllegalPauseThrowsDOMError) { | 119 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, IllegalPauseThrowsDOMError) { |
| 120 MakeTypicalCall("testIllegalPauseThrowsDOMError();", kMediaRecorderHtmlFile); | 120 MakeTypicalCall("testIllegalPauseThrowsDOMError();", kMediaRecorderHtmlFile); |
| 121 } | 121 } |
| 122 | 122 |
| 123 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, TwoChannelAudioRecording) { | 123 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, TwoChannelAudioRecording) { |
| 124 MakeTypicalCall("testTwoChannelAudio();", kMediaRecorderHtmlFile); | 124 MakeTypicalCall("testTwoChannelAudio();", kMediaRecorderHtmlFile); |
| 125 } | 125 } |
| 126 | 126 |
| 127 IN_PROC_BROWSER_TEST_P(WebRtcMediaRecorderTest, ResizeVideoInput) { |
| 128 MaybeForceDisableEncodeAccelerator(GetParam().disable_accelerator); |
| 129 MakeTypicalCall(base::StringPrintf("testResizeVideoInput(\"%s\");", |
| 130 GetParam().mime_type.c_str()), |
| 131 kMediaRecorderHtmlFile); |
| 132 } |
| 133 |
| 127 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, IllegalStopThrowsDOMError) { | 134 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, IllegalStopThrowsDOMError) { |
| 128 MakeTypicalCall("testIllegalStopThrowsDOMError();", kMediaRecorderHtmlFile); | 135 MakeTypicalCall("testIllegalStopThrowsDOMError();", kMediaRecorderHtmlFile); |
| 129 } | 136 } |
| 130 | 137 |
| 131 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, | 138 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, |
| 132 IllegalStartWhileRecordingThrowsDOMError) { | 139 IllegalStartWhileRecordingThrowsDOMError) { |
| 133 MakeTypicalCall("testIllegalStartInRecordingStateThrowsDOMError();", | 140 MakeTypicalCall("testIllegalStartInRecordingStateThrowsDOMError();", |
| 134 kMediaRecorderHtmlFile); | 141 kMediaRecorderHtmlFile); |
| 135 } | 142 } |
| 136 | 143 |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 174 RemovingTrackFromMediaStreamFiresErrorEvent) { | 181 RemovingTrackFromMediaStreamFiresErrorEvent) { |
| 175 MakeTypicalCall("testRemovingTrackFromMediaStreamFiresErrorEvent();", | 182 MakeTypicalCall("testRemovingTrackFromMediaStreamFiresErrorEvent();", |
| 176 kMediaRecorderHtmlFile); | 183 kMediaRecorderHtmlFile); |
| 177 } | 184 } |
| 178 | 185 |
| 179 INSTANTIATE_TEST_CASE_P(, | 186 INSTANTIATE_TEST_CASE_P(, |
| 180 WebRtcMediaRecorderTest, | 187 WebRtcMediaRecorderTest, |
| 181 testing::ValuesIn(kEncodingParameters)); | 188 testing::ValuesIn(kEncodingParameters)); |
| 182 | 189 |
| 183 } // namespace content | 190 } // namespace content |
| OLD | NEW |