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