| 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/files/file_util.h" | 6 #include "base/files/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 "content/browser/web_contents/web_contents_impl.h" | 9 #include "content/browser/web_contents/web_contents_impl.h" |
| 10 #include "content/public/common/content_switches.h" | 10 #include "content/public/common/content_switches.h" |
| (...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 141 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, | 141 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, |
| 142 MAYBE_CanSetupVideoCallWith4To3AspectRatio) { | 142 MAYBE_CanSetupVideoCallWith4To3AspectRatio) { |
| 143 const std::string javascript = | 143 const std::string javascript = |
| 144 "callAndExpectResolution({video: {mandatory: { minWidth: 960," | 144 "callAndExpectResolution({video: {mandatory: { minWidth: 960," |
| 145 "maxWidth: 960, minAspectRatio: 1.333, maxAspectRatio: 1.333}}}, 960," | 145 "maxWidth: 960, minAspectRatio: 1.333, maxAspectRatio: 1.333}}}, 960," |
| 146 " 720);"; | 146 " 720);"; |
| 147 MakeTypicalPeerConnectionCall(javascript); | 147 MakeTypicalPeerConnectionCall(javascript); |
| 148 } | 148 } |
| 149 | 149 |
| 150 // Flaky on TSAN v2. http://crbug.com/408006 | 150 // Flaky on TSAN v2. http://crbug.com/408006 |
| 151 #if defined(THREAD_SANITIZER) | 151 // Flaky everywhere: http://crbug.com/477498 |
| 152 #define MAYBE_CanSetupVideoCallAndDisableLocalVideo \ | |
| 153 DISABLED_CanSetupVideoCallAndDisableLocalVideo | |
| 154 #else | |
| 155 #define MAYBE_CanSetupVideoCallAndDisableLocalVideo \ | |
| 156 CanSetupVideoCallAndDisableLocalVideo | |
| 157 #endif | |
| 158 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, | 152 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, |
| 159 MAYBE_CanSetupVideoCallAndDisableLocalVideo) { | 153 DISABLED_CanSetupVideoCallAndDisableLocalVideo) { |
| 160 const std::string javascript = | 154 const std::string javascript = |
| 161 "callAndDisableLocalVideo({video: true});"; | 155 "callAndDisableLocalVideo({video: true});"; |
| 162 MakeTypicalPeerConnectionCall(javascript); | 156 MakeTypicalPeerConnectionCall(javascript); |
| 163 } | 157 } |
| 164 | 158 |
| 165 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY) | 159 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY) |
| 166 // Timing out on ARM linux, see http://crbug.com/240376 | 160 // Timing out on ARM linux, see http://crbug.com/240376 |
| 167 #define MAYBE_CanSetupAudioAndVideoCall DISABLED_CanSetupAudioAndVideoCall | 161 #define MAYBE_CanSetupAudioAndVideoCall DISABLED_CanSetupAudioAndVideoCall |
| 168 #else | 162 #else |
| 169 #define MAYBE_CanSetupAudioAndVideoCall CanSetupAudioAndVideoCall | 163 #define MAYBE_CanSetupAudioAndVideoCall CanSetupAudioAndVideoCall |
| (...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 418 | 412 |
| 419 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, CallAndVerifyVideoMutingWorks) { | 413 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, CallAndVerifyVideoMutingWorks) { |
| 420 MakeTypicalPeerConnectionCall("callAndEnsureVideoTrackMutingWorks();"); | 414 MakeTypicalPeerConnectionCall("callAndEnsureVideoTrackMutingWorks();"); |
| 421 } | 415 } |
| 422 | 416 |
| 423 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, CreateOfferWithOfferOptions) { | 417 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, CreateOfferWithOfferOptions) { |
| 424 MakeTypicalPeerConnectionCall("testCreateOfferOptions();"); | 418 MakeTypicalPeerConnectionCall("testCreateOfferOptions();"); |
| 425 } | 419 } |
| 426 | 420 |
| 427 } // namespace content | 421 } // namespace content |
| OLD | NEW |