| 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 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 136 MakeTypicalCall("testIllegalStartInPausedStateThrowsDOMError();", | 136 MakeTypicalCall("testIllegalStartInPausedStateThrowsDOMError();", |
| 137 kMediaRecorderHtmlFile); | 137 kMediaRecorderHtmlFile); |
| 138 } | 138 } |
| 139 | 139 |
| 140 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, | 140 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, |
| 141 IllegalRequestDataThrowsDOMError) { | 141 IllegalRequestDataThrowsDOMError) { |
| 142 MakeTypicalCall("testIllegalRequestDataThrowsDOMError();", | 142 MakeTypicalCall("testIllegalRequestDataThrowsDOMError();", |
| 143 kMediaRecorderHtmlFile); | 143 kMediaRecorderHtmlFile); |
| 144 } | 144 } |
| 145 | 145 |
| 146 // http://crbug.com/673126, flaky on Android. | 146 IN_PROC_BROWSER_TEST_P(WebRtcMediaRecorderTest, PeerConnection) { |
| 147 #if defined(OS_ANDROID) | |
| 148 #define MAYBE_PeerConnection DISABLED_PeerConnection | |
| 149 #else | |
| 150 #define MAYBE_PeerConnection PeerConnection | |
| 151 #endif | |
| 152 IN_PROC_BROWSER_TEST_P(WebRtcMediaRecorderTest, MAYBE_PeerConnection) { | |
| 153 MaybeForceDisableEncodeAccelerator(GetParam().disable_accelerator); | 147 MaybeForceDisableEncodeAccelerator(GetParam().disable_accelerator); |
| 154 MakeTypicalCall(base::StringPrintf("testRecordRemotePeerConnection(\"%s\");", | 148 MakeTypicalCall(base::StringPrintf("testRecordRemotePeerConnection(\"%s\");", |
| 155 GetParam().mime_type.c_str()), | 149 GetParam().mime_type.c_str()), |
| 156 kMediaRecorderHtmlFile); | 150 kMediaRecorderHtmlFile); |
| 157 } | 151 } |
| 158 | 152 |
| 159 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, | 153 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, |
| 160 AddingTrackToMediaStreamFiresErrorEvent) { | 154 AddingTrackToMediaStreamFiresErrorEvent) { |
| 161 MakeTypicalCall("testAddingTrackToMediaStreamFiresErrorEvent();", | 155 MakeTypicalCall("testAddingTrackToMediaStreamFiresErrorEvent();", |
| 162 kMediaRecorderHtmlFile); | 156 kMediaRecorderHtmlFile); |
| 163 } | 157 } |
| 164 | 158 |
| 165 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, | 159 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, |
| 166 RemovingTrackFromMediaStreamFiresErrorEvent) { | 160 RemovingTrackFromMediaStreamFiresErrorEvent) { |
| 167 MakeTypicalCall("testRemovingTrackFromMediaStreamFiresErrorEvent();", | 161 MakeTypicalCall("testRemovingTrackFromMediaStreamFiresErrorEvent();", |
| 168 kMediaRecorderHtmlFile); | 162 kMediaRecorderHtmlFile); |
| 169 } | 163 } |
| 170 | 164 |
| 171 INSTANTIATE_TEST_CASE_P(, | 165 INSTANTIATE_TEST_CASE_P(, |
| 172 WebRtcMediaRecorderTest, | 166 WebRtcMediaRecorderTest, |
| 173 testing::ValuesIn(kEncodingParameters)); | 167 testing::ValuesIn(kEncodingParameters)); |
| 174 | 168 |
| 175 } // namespace content | 169 } // namespace content |
| OLD | NEW |