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

Side by Side Diff: content/browser/media/webrtc/webrtc_browsertest_audio.cc

Issue 2171313003: Enable renegotiate tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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 | « content/browser/media/webrtc/webrtc_browsertest.cc ('k') | 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) 2016 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2016 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/threading/platform_thread.h" 7 #include "base/threading/platform_thread.h"
8 #include "build/build_config.h" 8 #include "build/build_config.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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 55
56 ASSERT_TRUE(base::CommandLine::ForCurrentProcess()->HasSwitch( 56 ASSERT_TRUE(base::CommandLine::ForCurrentProcess()->HasSwitch(
57 switches::kUseFakeDeviceForMediaStream)) 57 switches::kUseFakeDeviceForMediaStream))
58 << "Must run with fake devices since the test will explicitly look " 58 << "Must run with fake devices since the test will explicitly look "
59 << "for the fake device signal."; 59 << "for the fake device signal.";
60 60
61 MakeTypicalCall(javascript, "/media/peerconnection-call-audio.html"); 61 MakeTypicalCall(javascript, "/media/peerconnection-call-audio.html");
62 } 62 }
63 }; 63 };
64 64
65 // Causes asserts in libjingle: http://crbug.com/484826.
66 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserAudioTest, 65 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserAudioTest,
67 DISABLED_CanMakeVideoCallAndThenRenegotiateToAudio) { 66 CanMakeVideoCallAndThenRenegotiateToAudio) {
68 MakeAudioDetectingPeerConnectionCall( 67 MakeAudioDetectingPeerConnectionCall(
69 "callAndRenegotiateToAudio({audio: true, video:true}, {audio: true});"); 68 "callAndRenegotiateToAudio({audio: true, video:true}, {audio: true});");
70 } 69 }
71 70
72 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserAudioTest, 71 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserAudioTest,
73 EstablishAudioVideoCallAndEnsureAudioIsPlaying) { 72 EstablishAudioVideoCallAndEnsureAudioIsPlaying) {
74 MakeAudioDetectingPeerConnectionCall( 73 MakeAudioDetectingPeerConnectionCall(
75 "callAndEnsureAudioIsPlaying({audio:true, video:true});"); 74 "callAndEnsureAudioIsPlaying({audio:true, video:true});");
76 } 75 }
77 76
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 "callAndEnsureRemoteVideoMutingDoesntMuteAudio();"); 110 "callAndEnsureRemoteVideoMutingDoesntMuteAudio();");
112 } 111 }
113 112
114 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserAudioTest, 113 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserAudioTest,
115 EstablishAudioVideoCallAndVerifyUnmutingWorks) { 114 EstablishAudioVideoCallAndVerifyUnmutingWorks) {
116 MakeAudioDetectingPeerConnectionCall( 115 MakeAudioDetectingPeerConnectionCall(
117 "callAndEnsureAudioTrackUnmutingWorks();"); 116 "callAndEnsureAudioTrackUnmutingWorks();");
118 } 117 }
119 118
120 } // namespace content 119 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/media/webrtc/webrtc_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698