| 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 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 153 kMediaRecorderHtmlFile); | 153 kMediaRecorderHtmlFile); |
| 154 } | 154 } |
| 155 | 155 |
| 156 #if defined(OS_ANDROID) && defined(ADDRESS_SANITIZER) | 156 #if defined(OS_ANDROID) && defined(ADDRESS_SANITIZER) |
| 157 // Parametrizations 1/2 (VP8/VP9+disabled) time out under Android ASAN: | 157 // Parametrizations 1/2 (VP8/VP9+disabled) time out under Android ASAN: |
| 158 // https://crbug.com/693565. | 158 // https://crbug.com/693565. |
| 159 #define MAYBE_PeerConnection DISABLED_PeerConnection | 159 #define MAYBE_PeerConnection DISABLED_PeerConnection |
| 160 #elif defined(OS_LINUX) && defined(THREAD_SANITIZER) | 160 #elif defined(OS_LINUX) && defined(THREAD_SANITIZER) |
| 161 // Flaky on Linux TSan, https://crbug.com/694373. | 161 // Flaky on Linux TSan, https://crbug.com/694373. |
| 162 #define MAYBE_PeerConnection DISABLED_PeerConnection | 162 #define MAYBE_PeerConnection DISABLED_PeerConnection |
| 163 #elif defined(OS_WIN) && !defined(NDEBUG) |
| 164 // Fails on Win7 debug, https://crbug.com/703844. |
| 165 #define MAYBE_PeerConnection DISABLED_PeerConnection |
| 163 #else | 166 #else |
| 164 #define MAYBE_PeerConnection PeerConnection | 167 #define MAYBE_PeerConnection PeerConnection |
| 165 #endif | 168 #endif |
| 166 | 169 |
| 167 IN_PROC_BROWSER_TEST_P(WebRtcMediaRecorderTest, MAYBE_PeerConnection) { | 170 IN_PROC_BROWSER_TEST_P(WebRtcMediaRecorderTest, MAYBE_PeerConnection) { |
| 168 MaybeForceDisableEncodeAccelerator(GetParam().disable_accelerator); | 171 MaybeForceDisableEncodeAccelerator(GetParam().disable_accelerator); |
| 169 MakeTypicalCall(base::StringPrintf("testRecordRemotePeerConnection(\"%s\");", | 172 MakeTypicalCall(base::StringPrintf("testRecordRemotePeerConnection(\"%s\");", |
| 170 GetParam().mime_type.c_str()), | 173 GetParam().mime_type.c_str()), |
| 171 kMediaRecorderHtmlFile); | 174 kMediaRecorderHtmlFile); |
| 172 } | 175 } |
| 173 | 176 |
| 174 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, | 177 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, |
| 175 AddingTrackToMediaStreamFiresErrorEvent) { | 178 AddingTrackToMediaStreamFiresErrorEvent) { |
| 176 MakeTypicalCall("testAddingTrackToMediaStreamFiresErrorEvent();", | 179 MakeTypicalCall("testAddingTrackToMediaStreamFiresErrorEvent();", |
| 177 kMediaRecorderHtmlFile); | 180 kMediaRecorderHtmlFile); |
| 178 } | 181 } |
| 179 | 182 |
| 180 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, | 183 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, |
| 181 RemovingTrackFromMediaStreamFiresErrorEvent) { | 184 RemovingTrackFromMediaStreamFiresErrorEvent) { |
| 182 MakeTypicalCall("testRemovingTrackFromMediaStreamFiresErrorEvent();", | 185 MakeTypicalCall("testRemovingTrackFromMediaStreamFiresErrorEvent();", |
| 183 kMediaRecorderHtmlFile); | 186 kMediaRecorderHtmlFile); |
| 184 } | 187 } |
| 185 | 188 |
| 186 INSTANTIATE_TEST_CASE_P(, | 189 INSTANTIATE_TEST_CASE_P(, |
| 187 WebRtcMediaRecorderTest, | 190 WebRtcMediaRecorderTest, |
| 188 testing::ValuesIn(kEncodingParameters)); | 191 testing::ValuesIn(kEncodingParameters)); |
| 189 | 192 |
| 190 } // namespace content | 193 } // namespace content |
| OLD | NEW |