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/public/common/content_switches.h" | 9 #include "content/public/common/content_switches.h" |
10 #include "content/public/test/browser_test_utils.h" | 10 #include "content/public/test/browser_test_utils.h" |
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
141 MakeTypicalCall("testIllegalStartInPausedStateThrowsDOMError();", | 141 MakeTypicalCall("testIllegalStartInPausedStateThrowsDOMError();", |
142 kMediaRecorderHtmlFile); | 142 kMediaRecorderHtmlFile); |
143 } | 143 } |
144 | 144 |
145 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, | 145 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, |
146 MediaRecorderIllegalRequestDataThrowsDOMError) { | 146 MediaRecorderIllegalRequestDataThrowsDOMError) { |
147 MakeTypicalCall("testIllegalRequestDataThrowsDOMError();", | 147 MakeTypicalCall("testIllegalRequestDataThrowsDOMError();", |
148 kMediaRecorderHtmlFile); | 148 kMediaRecorderHtmlFile); |
149 } | 149 } |
150 | 150 |
151 #if defined(OS_ANDROID) | 151 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, MediaRecorderPeerConnection) { |
152 // TODO(cpaulin): when http://crbug.com/585242 is fixed, enable peer connection | |
153 // recording test on android platform. | |
154 #define MAYBE_MediaRecorderPeerConnection DISABLED_MediaRecorderPeerConnection | |
155 #else | |
156 #define MAYBE_MediaRecorderPeerConnection MediaRecorderPeerConnection | |
157 #endif | |
158 | |
159 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, | |
160 MAYBE_MediaRecorderPeerConnection) { | |
161 MakeTypicalCall("testRecordRemotePeerConnection();", kMediaRecorderHtmlFile); | 152 MakeTypicalCall("testRecordRemotePeerConnection();", kMediaRecorderHtmlFile); |
162 } | 153 } |
163 | 154 |
164 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, | 155 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, |
165 AddingTrackToMediaStreamFiresErrorEvent) { | 156 AddingTrackToMediaStreamFiresErrorEvent) { |
166 MakeTypicalCall("testAddingTrackToMediaStreamFiresErrorEvent();", | 157 MakeTypicalCall("testAddingTrackToMediaStreamFiresErrorEvent();", |
167 kMediaRecorderHtmlFile); | 158 kMediaRecorderHtmlFile); |
168 } | 159 } |
169 | 160 |
170 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, | 161 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, |
171 RemovingTrackFromMediaStreamFiresErrorEvent) { | 162 RemovingTrackFromMediaStreamFiresErrorEvent) { |
172 MakeTypicalCall("testRemovingTrackFromMediaStreamFiresErrorEvent();", | 163 MakeTypicalCall("testRemovingTrackFromMediaStreamFiresErrorEvent();", |
173 kMediaRecorderHtmlFile); | 164 kMediaRecorderHtmlFile); |
174 } | 165 } |
175 | 166 |
176 INSTANTIATE_TEST_CASE_P(, | 167 INSTANTIATE_TEST_CASE_P(, |
177 WebRtcMediaRecorderTest, | 168 WebRtcMediaRecorderTest, |
178 testing::ValuesIn(kEncodingParameters)); | 169 testing::ValuesIn(kEncodingParameters)); |
179 | 170 |
180 } // namespace content | 171 } // namespace content |
OLD | NEW |