| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/file_util.h" | 6 #include "base/file_util.h" |
| 7 #include "base/process/process_handle.h" | 7 #include "base/process/process_handle.h" |
| 8 #include "base/strings/string_number_conversions.h" | 8 #include "base/strings/string_number_conversions.h" |
| 9 #include "base/strings/stringprintf.h" | 9 #include "base/strings/stringprintf.h" |
| 10 #include "base/threading/platform_thread.h" | 10 #include "base/threading/platform_thread.h" |
| (...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 261 MakeTypicalPeerConnectionCall("callWithLegacySdp();"); | 261 MakeTypicalPeerConnectionCall("callWithLegacySdp();"); |
| 262 } | 262 } |
| 263 | 263 |
| 264 // This test will make a PeerConnection-based call and test an unreliable text | 264 // This test will make a PeerConnection-based call and test an unreliable text |
| 265 // dataChannel. | 265 // dataChannel. |
| 266 // TODO(mallinath) - Remove this test after rtp based data channel is disabled. | 266 // TODO(mallinath) - Remove this test after rtp based data channel is disabled. |
| 267 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, CallWithDataOnly) { | 267 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, CallWithDataOnly) { |
| 268 MakeTypicalPeerConnectionCall("callWithDataOnly();"); | 268 MakeTypicalPeerConnectionCall("callWithDataOnly();"); |
| 269 } | 269 } |
| 270 | 270 |
| 271 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, CallWithSctpDataOnly) { | 271 #if defined(MEMORY_SANITIZER) |
| 272 // Fails under MemorySanitizer: http://crbug.com/405951 |
| 273 #define MAYBE_CallWithSctpDataOnly DISABLED_CallWithSctpDataOnly |
| 274 #else |
| 275 #define MAYBE_CallWithSctpDataOnly CallWithSctpDataOnly |
| 276 #endif |
| 277 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, MAYBE_CallWithSctpDataOnly) { |
| 272 MakeTypicalPeerConnectionCall("callWithSctpDataOnly();"); | 278 MakeTypicalPeerConnectionCall("callWithSctpDataOnly();"); |
| 273 } | 279 } |
| 274 | 280 |
| 275 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY) | 281 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY) |
| 276 // Timing out on ARM linux bot: http://crbug.com/238490 | 282 // Timing out on ARM linux bot: http://crbug.com/238490 |
| 277 #define MAYBE_CallWithDataAndMedia DISABLED_CallWithDataAndMedia | 283 #define MAYBE_CallWithDataAndMedia DISABLED_CallWithDataAndMedia |
| 278 #else | 284 #else |
| 279 #define MAYBE_CallWithDataAndMedia CallWithDataAndMedia | 285 #define MAYBE_CallWithDataAndMedia CallWithDataAndMedia |
| 280 #endif | 286 #endif |
| 281 | 287 |
| 282 // This test will make a PeerConnection-based call and test an unreliable text | 288 // This test will make a PeerConnection-based call and test an unreliable text |
| 283 // dataChannel and audio and video tracks. | 289 // dataChannel and audio and video tracks. |
| 284 // TODO(mallinath) - Remove this test after rtp based data channel is disabled. | 290 // TODO(mallinath) - Remove this test after rtp based data channel is disabled. |
| 285 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, DISABLED_CallWithDataAndMedia) { | 291 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, DISABLED_CallWithDataAndMedia) { |
| 286 MakeTypicalPeerConnectionCall("callWithDataAndMedia();"); | 292 MakeTypicalPeerConnectionCall("callWithDataAndMedia();"); |
| 287 } | 293 } |
| 288 | 294 |
| 289 | 295 |
| 290 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY) | 296 #if (defined(OS_LINUX) && !defined(OS_CHROMEOS) && \ |
| 297 defined(ARCH_CPU_ARM_FAMILY)) || defined(MEMORY_SANITIZER) |
| 291 // Timing out on ARM linux bot: http://crbug.com/238490 | 298 // Timing out on ARM linux bot: http://crbug.com/238490 |
| 299 // Fails under MemorySanitizer: http://crbug.com/405951 |
| 292 #define MAYBE_CallWithSctpDataAndMedia DISABLED_CallWithSctpDataAndMedia | 300 #define MAYBE_CallWithSctpDataAndMedia DISABLED_CallWithSctpDataAndMedia |
| 293 #else | 301 #else |
| 294 #define MAYBE_CallWithSctpDataAndMedia CallWithSctpDataAndMedia | 302 #define MAYBE_CallWithSctpDataAndMedia CallWithSctpDataAndMedia |
| 295 #endif | 303 #endif |
| 296 | 304 |
| 297 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, | 305 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, |
| 298 MAYBE_CallWithSctpDataAndMedia) { | 306 MAYBE_CallWithSctpDataAndMedia) { |
| 299 MakeTypicalPeerConnectionCall("callWithSctpDataAndMedia();"); | 307 MakeTypicalPeerConnectionCall("callWithSctpDataAndMedia();"); |
| 300 } | 308 } |
| 301 | 309 |
| (...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 560 | 568 |
| 561 base::DeleteFile(unique_dump_file, false); | 569 base::DeleteFile(unique_dump_file, false); |
| 562 } | 570 } |
| 563 } | 571 } |
| 564 | 572 |
| 565 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, CreateOfferWithOfferOptions) { | 573 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, CreateOfferWithOfferOptions) { |
| 566 MakeTypicalPeerConnectionCall("testCreateOfferOptions();"); | 574 MakeTypicalPeerConnectionCall("testCreateOfferOptions();"); |
| 567 } | 575 } |
| 568 | 576 |
| 569 } // namespace content | 577 } // namespace content |
| OLD | NEW |