Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(217)

Side by Side Diff: content/browser/media/webrtc_browsertest.cc

Issue 612413003: Re-enabling WebRtcBrowserTest.CallWithDataAndMedia (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY) 310 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY)
311 // Timing out on ARM linux bot: http://crbug.com/238490 311 // Timing out on ARM linux bot: http://crbug.com/238490
312 #define MAYBE_CallWithDataAndMedia DISABLED_CallWithDataAndMedia 312 #define MAYBE_CallWithDataAndMedia DISABLED_CallWithDataAndMedia
313 #else 313 #else
314 #define MAYBE_CallWithDataAndMedia CallWithDataAndMedia 314 #define MAYBE_CallWithDataAndMedia CallWithDataAndMedia
315 #endif 315 #endif
316 316
317 // This test will make a PeerConnection-based call and test an unreliable text 317 // This test will make a PeerConnection-based call and test an unreliable text
318 // dataChannel and audio and video tracks. 318 // dataChannel and audio and video tracks.
319 // TODO(mallinath) - Remove this test after rtp based data channel is disabled. 319 // TODO(mallinath) - Remove this test after rtp based data channel is disabled.
320 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, DISABLED_CallWithDataAndMedia) { 320 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, MAYBE_CallWithDataAndMedia) {
321 MakeTypicalPeerConnectionCall("callWithDataAndMedia();"); 321 MakeTypicalPeerConnectionCall("callWithDataAndMedia();");
322 } 322 }
323 323
324 324
325 #if (defined(OS_LINUX) && !defined(OS_CHROMEOS) && \ 325 #if (defined(OS_LINUX) && !defined(OS_CHROMEOS) && \
326 defined(ARCH_CPU_ARM_FAMILY)) || defined(MEMORY_SANITIZER) 326 defined(ARCH_CPU_ARM_FAMILY)) || defined(MEMORY_SANITIZER)
327 // Timing out on ARM linux bot: http://crbug.com/238490 327 // Timing out on ARM linux bot: http://crbug.com/238490
328 // Fails under MemorySanitizer: http://crbug.com/405951 328 // Fails under MemorySanitizer: http://crbug.com/405951
329 #define MAYBE_CallWithSctpDataAndMedia DISABLED_CallWithSctpDataAndMedia 329 #define MAYBE_CallWithSctpDataAndMedia DISABLED_CallWithSctpDataAndMedia
330 #else 330 #else
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
439 439
440 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, CallAndVerifyVideoMutingWorks) { 440 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, CallAndVerifyVideoMutingWorks) {
441 MakeTypicalPeerConnectionCall("callAndEnsureVideoTrackMutingWorks();"); 441 MakeTypicalPeerConnectionCall("callAndEnsureVideoTrackMutingWorks();");
442 } 442 }
443 443
444 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, CreateOfferWithOfferOptions) { 444 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, CreateOfferWithOfferOptions) {
445 MakeTypicalPeerConnectionCall("testCreateOfferOptions();"); 445 MakeTypicalPeerConnectionCall("testCreateOfferOptions();");
446 } 446 }
447 447
448 } // namespace content 448 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698