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

Side by Side Diff: content/browser/media/webrtc/webrtc_browsertest.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 | « no previous file | content/browser/media/webrtc/webrtc_browsertest_audio.cc » ('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/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 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 MakeTypicalPeerConnectionCall("callAndSendDtmf(\'123,abc\');"); 106 MakeTypicalPeerConnectionCall("callAndSendDtmf(\'123,abc\');");
107 } 107 }
108 108
109 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, 109 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest,
110 CanMakeEmptyCallThenAddStreamsAndRenegotiate) { 110 CanMakeEmptyCallThenAddStreamsAndRenegotiate) {
111 const char* kJavascript = 111 const char* kJavascript =
112 "callEmptyThenAddOneStreamAndRenegotiate({video: true, audio: true});"; 112 "callEmptyThenAddOneStreamAndRenegotiate({video: true, audio: true});";
113 MakeTypicalPeerConnectionCall(kJavascript); 113 MakeTypicalPeerConnectionCall(kJavascript);
114 } 114 }
115 115
116 // Causes asserts in libjingle: http://crbug.com/484826.
117 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, 116 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest,
118 DISABLED_CanMakeAudioCallAndThenRenegotiateToVideo) { 117 CanMakeAudioCallAndThenRenegotiateToVideo) {
119 const char* kJavascript = 118 const char* kJavascript =
120 "callAndRenegotiateToVideo({audio: true}, {audio: true, video:true});"; 119 "callAndRenegotiateToVideo({audio: true}, {audio: true, video:true});";
121 MakeTypicalPeerConnectionCall(kJavascript); 120 MakeTypicalPeerConnectionCall(kJavascript);
122 } 121 }
123 122
124 // This test makes a call between pc1 and pc2 where a video only stream is sent 123 // This test makes a call between pc1 and pc2 where a video only stream is sent
125 // from pc1 to pc2. The stream sent from pc1 to pc2 is cloned from the stream 124 // from pc1 to pc2. The stream sent from pc1 to pc2 is cloned from the stream
126 // received on pc2 to test that cloning of remote video and audio tracks works 125 // received on pc2 to test that cloning of remote video and audio tracks works
127 // as intended and is sent back to pc1. 126 // as intended and is sent back to pc1.
128 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, CanForwardRemoteStream) { 127 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, CanForwardRemoteStream) {
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 196
198 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, CreateOfferWithOfferOptions) { 197 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, CreateOfferWithOfferOptions) {
199 MakeTypicalPeerConnectionCall("testCreateOfferOptions();"); 198 MakeTypicalPeerConnectionCall("testCreateOfferOptions();");
200 } 199 }
201 200
202 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, CallInsideIframe) { 201 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, CallInsideIframe) {
203 MakeTypicalPeerConnectionCall("callInsideIframe({video: true, audio:true});"); 202 MakeTypicalPeerConnectionCall("callInsideIframe({video: true, audio:true});");
204 } 203 }
205 204
206 } // namespace content 205 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/browser/media/webrtc/webrtc_browsertest_audio.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698