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

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

Issue 468243003: Adding local stream mute tests, tightening up WebRTC audio tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | content/test/data/media/peerconnection-call.html » ('j') | 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/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 339 matching lines...) Expand 10 before | Expand all | Expand 10 after
350 } 350 }
351 351
352 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, 352 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest,
353 EstablishAudioOnlyCallAndEnsureAudioIsPlaying) { 353 EstablishAudioOnlyCallAndEnsureAudioIsPlaying) {
354 MakeAudioDetectingPeerConnectionCall(base::StringPrintf( 354 MakeAudioDetectingPeerConnectionCall(base::StringPrintf(
355 "callAndEnsureAudioIsPlaying(%s, {audio:true});", 355 "callAndEnsureAudioIsPlaying(%s, {audio:true});",
356 kUseLenientAudioChecking)); 356 kUseLenientAudioChecking));
357 } 357 }
358 358
359 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, 359 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest,
360 EstablishAudioVideoCallAndVerifyMutingWorks) { 360 EstablishAudioVideoCallAndVerifyRemoteMutingWorks) {
361 MakeAudioDetectingPeerConnectionCall(base::StringPrintf( 361 MakeAudioDetectingPeerConnectionCall(base::StringPrintf(
362 "callAndEnsureAudioTrackMutingWorks(%s);", kUseLenientAudioChecking)); 362 "callAndEnsureRemoteAudioTrackMutingWorks(%s);",
363 kUseLenientAudioChecking));
364 }
365
366 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest,
367 EstablishAudioVideoCallAndVerifyLocalMutingWorks) {
368 MakeAudioDetectingPeerConnectionCall(base::StringPrintf(
369 "callAndEnsureLocalAudioTrackMutingWorks(%s);",
370 kUseLenientAudioChecking));
371 }
372
373 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest,
374 EnsureLocalVideoMuteDoesntMuteAudio) {
375 MakeAudioDetectingPeerConnectionCall(base::StringPrintf(
376 "callAndEnsureLocalVideoMutingDoesntMuteAudio(%s);",
377 kUseLenientAudioChecking));
378 }
379
380 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest,
381 EnsureRemoteVideoMuteDoesntMuteAudio) {
382 MakeAudioDetectingPeerConnectionCall(base::StringPrintf(
383 "callAndEnsureRemoteVideoMutingDoesntMuteAudio(%s);",
384 kUseLenientAudioChecking));
363 } 385 }
364 386
365 // Flaky on TSAN v2: http://crbug.com/373637 387 // Flaky on TSAN v2: http://crbug.com/373637
366 #if defined(THREAD_SANITIZER) 388 #if defined(THREAD_SANITIZER)
367 #define MAYBE_EstablishAudioVideoCallAndVerifyUnmutingWorks\ 389 #define MAYBE_EstablishAudioVideoCallAndVerifyUnmutingWorks\
368 DISABLED_EstablishAudioVideoCallAndVerifyUnmutingWorks 390 DISABLED_EstablishAudioVideoCallAndVerifyUnmutingWorks
369 #else 391 #else
370 #define MAYBE_EstablishAudioVideoCallAndVerifyUnmutingWorks\ 392 #define MAYBE_EstablishAudioVideoCallAndVerifyUnmutingWorks\
371 EstablishAudioVideoCallAndVerifyUnmutingWorks 393 EstablishAudioVideoCallAndVerifyUnmutingWorks
372 #endif 394 #endif
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
538 560
539 base::DeleteFile(unique_dump_file, false); 561 base::DeleteFile(unique_dump_file, false);
540 } 562 }
541 } 563 }
542 564
543 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, CreateOfferWithOfferOptions) { 565 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, CreateOfferWithOfferOptions) {
544 MakeTypicalPeerConnectionCall("testCreateOfferOptions();"); 566 MakeTypicalPeerConnectionCall("testCreateOfferOptions();");
545 } 567 }
546 568
547 } // namespace content 569 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/test/data/media/peerconnection-call.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698