| 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/strings/stringprintf.h" | 7 #include "base/strings/stringprintf.h" |
| 8 #include "base/threading/platform_thread.h" | 8 #include "base/threading/platform_thread.h" |
| 9 #include "base/values.h" | 9 #include "base/values.h" |
| 10 #include "content/browser/media/webrtc_internals.h" | 10 #include "content/browser/media/webrtc_internals.h" |
| (...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 240 #elif defined(THREAD_SANITIZER) | 240 #elif defined(THREAD_SANITIZER) |
| 241 // Flaky on TSAN v2: http://crbug.com/373637 | 241 // Flaky on TSAN v2: http://crbug.com/373637 |
| 242 #define MAYBE_CallWithDataAndMedia DISABLED_CallWithDataAndMedia | 242 #define MAYBE_CallWithDataAndMedia DISABLED_CallWithDataAndMedia |
| 243 #else | 243 #else |
| 244 #define MAYBE_CallWithDataAndMedia CallWithDataAndMedia | 244 #define MAYBE_CallWithDataAndMedia CallWithDataAndMedia |
| 245 #endif | 245 #endif |
| 246 | 246 |
| 247 // This test will make a PeerConnection-based call and test an unreliable text | 247 // This test will make a PeerConnection-based call and test an unreliable text |
| 248 // dataChannel and audio and video tracks. | 248 // dataChannel and audio and video tracks. |
| 249 // TODO(mallinath) - Remove this test after rtp based data channel is disabled. | 249 // TODO(mallinath) - Remove this test after rtp based data channel is disabled. |
| 250 IN_PROC_BROWSER_TEST_P(WebRtcBrowserTest, MAYBE_CallWithDataAndMedia) { | 250 IN_PROC_BROWSER_TEST_P(WebRtcBrowserTest, DISABLED_CallWithDataAndMedia) { |
| 251 MakeTypicalPeerConnectionCall("callWithDataAndMedia();"); | 251 MakeTypicalPeerConnectionCall("callWithDataAndMedia();"); |
| 252 } | 252 } |
| 253 | 253 |
| 254 | 254 |
| 255 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY) | 255 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY) |
| 256 // Timing out on ARM linux bot: http://crbug.com/238490 | 256 // Timing out on ARM linux bot: http://crbug.com/238490 |
| 257 #define MAYBE_CallWithSctpDataAndMedia DISABLED_CallWithSctpDataAndMedia | 257 #define MAYBE_CallWithSctpDataAndMedia DISABLED_CallWithSctpDataAndMedia |
| 258 #else | 258 #else |
| 259 #define MAYBE_CallWithSctpDataAndMedia CallWithSctpDataAndMedia | 259 #define MAYBE_CallWithSctpDataAndMedia CallWithSctpDataAndMedia |
| 260 #endif | 260 #endif |
| (...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 435 | 435 |
| 436 EXPECT_TRUE(base::PathExists(dump_file)); | 436 EXPECT_TRUE(base::PathExists(dump_file)); |
| 437 int64 file_size = 0; | 437 int64 file_size = 0; |
| 438 EXPECT_TRUE(base::GetFileSize(dump_file, &file_size)); | 438 EXPECT_TRUE(base::GetFileSize(dump_file, &file_size)); |
| 439 EXPECT_EQ(0, file_size); | 439 EXPECT_EQ(0, file_size); |
| 440 | 440 |
| 441 base::DeleteFile(dump_file, false); | 441 base::DeleteFile(dump_file, false); |
| 442 } | 442 } |
| 443 | 443 |
| 444 } // namespace content | 444 } // namespace content |
| OLD | NEW |