| 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 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 143 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, | 143 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, |
| 144 IllegalRequestDataThrowsDOMError) { | 144 IllegalRequestDataThrowsDOMError) { |
| 145 MakeTypicalCall("testIllegalRequestDataThrowsDOMError();", | 145 MakeTypicalCall("testIllegalRequestDataThrowsDOMError();", |
| 146 kMediaRecorderHtmlFile); | 146 kMediaRecorderHtmlFile); |
| 147 } | 147 } |
| 148 | 148 |
| 149 #if defined(OS_ANDROID) && defined(ADDRESS_SANITIZER) | 149 #if defined(OS_ANDROID) && defined(ADDRESS_SANITIZER) |
| 150 // Parametrizations 1/2 (VP8/VP9+disabled) time out under Android ASAN: | 150 // Parametrizations 1/2 (VP8/VP9+disabled) time out under Android ASAN: |
| 151 // https://crbug.com/693565. | 151 // https://crbug.com/693565. |
| 152 #define MAYBE_PeerConnection DISABLED_PeerConnection | 152 #define MAYBE_PeerConnection DISABLED_PeerConnection |
| 153 #elif defined(OS_LINUX) && defined(THREAD_SANITIZER) | |
| 154 // Flaky on Linux TSan, https://crbug.com/694373. | |
| 155 #define MAYBE_PeerConnection DISABLED_PeerConnection | |
| 156 #else | 153 #else |
| 157 #define MAYBE_PeerConnection PeerConnection | 154 #define MAYBE_PeerConnection PeerConnection |
| 158 #endif | 155 #endif |
| 159 | 156 |
| 160 IN_PROC_BROWSER_TEST_P(WebRtcMediaRecorderTest, MAYBE_PeerConnection) { | 157 IN_PROC_BROWSER_TEST_P(WebRtcMediaRecorderTest, MAYBE_PeerConnection) { |
| 161 MaybeForceDisableEncodeAccelerator(GetParam().disable_accelerator); | 158 MaybeForceDisableEncodeAccelerator(GetParam().disable_accelerator); |
| 162 MakeTypicalCall(base::StringPrintf("testRecordRemotePeerConnection(\"%s\");", | 159 MakeTypicalCall(base::StringPrintf("testRecordRemotePeerConnection(\"%s\");", |
| 163 GetParam().mime_type.c_str()), | 160 GetParam().mime_type.c_str()), |
| 164 kMediaRecorderHtmlFile); | 161 kMediaRecorderHtmlFile); |
| 165 } | 162 } |
| 166 | 163 |
| 167 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, | 164 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, |
| 168 AddingTrackToMediaStreamFiresErrorEvent) { | 165 AddingTrackToMediaStreamFiresErrorEvent) { |
| 169 MakeTypicalCall("testAddingTrackToMediaStreamFiresErrorEvent();", | 166 MakeTypicalCall("testAddingTrackToMediaStreamFiresErrorEvent();", |
| 170 kMediaRecorderHtmlFile); | 167 kMediaRecorderHtmlFile); |
| 171 } | 168 } |
| 172 | 169 |
| 173 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, | 170 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, |
| 174 RemovingTrackFromMediaStreamFiresErrorEvent) { | 171 RemovingTrackFromMediaStreamFiresErrorEvent) { |
| 175 MakeTypicalCall("testRemovingTrackFromMediaStreamFiresErrorEvent();", | 172 MakeTypicalCall("testRemovingTrackFromMediaStreamFiresErrorEvent();", |
| 176 kMediaRecorderHtmlFile); | 173 kMediaRecorderHtmlFile); |
| 177 } | 174 } |
| 178 | 175 |
| 179 INSTANTIATE_TEST_CASE_P(, | 176 INSTANTIATE_TEST_CASE_P(, |
| 180 WebRtcMediaRecorderTest, | 177 WebRtcMediaRecorderTest, |
| 181 testing::ValuesIn(kEncodingParameters)); | 178 testing::ValuesIn(kEncodingParameters)); |
| 182 | 179 |
| 183 } // namespace content | 180 } // namespace content |
| OLD | NEW |