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