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

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

Issue 254713004: Reenable WebrtcBrowserTest.CanMakeEmptyCallThenAddStreamsAndRenegotiateEnable test again. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 6 years, 3 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 | 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/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 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 #endif 147 #endif
148 148
149 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, MAYBE_CanSetupAudioAndVideoCall) { 149 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, MAYBE_CanSetupAudioAndVideoCall) {
150 MakeTypicalPeerConnectionCall("call({video: true, audio: true});"); 150 MakeTypicalPeerConnectionCall("call({video: true, audio: true});");
151 } 151 }
152 152
153 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, MANUAL_CanSetupCallAndSendDtmf) { 153 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, MANUAL_CanSetupCallAndSendDtmf) {
154 MakeTypicalPeerConnectionCall("callAndSendDtmf(\'123,abc\');"); 154 MakeTypicalPeerConnectionCall("callAndSendDtmf(\'123,abc\');");
155 } 155 }
156 156
157 // TODO(phoglund): this test fails because the peer connection state will be
158 // stable in the second negotiation round rather than have-local-offer.
159 // http://crbug.com/293125.
160 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, 157 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest,
161 DISABLED_CanMakeEmptyCallThenAddStreamsAndRenegotiate) { 158 CanMakeEmptyCallThenAddStreamsAndRenegotiate) {
162 const char* kJavascript = 159 const char* kJavascript =
163 "callEmptyThenAddOneStreamAndRenegotiate({video: true, audio: true});"; 160 "callEmptyThenAddOneStreamAndRenegotiate({video: true, audio: true});";
164 MakeTypicalPeerConnectionCall(kJavascript); 161 MakeTypicalPeerConnectionCall(kJavascript);
165 } 162 }
166 163
167 // Below 2 test will make a complete PeerConnection-based call between pc1 and 164 // Below 2 test will make a complete PeerConnection-based call between pc1 and
168 // pc2, and then use the remote stream to setup a call between pc3 and pc4, and 165 // pc2, and then use the remote stream to setup a call between pc3 and pc4, and
169 // then verify that video is received on pc3 and pc4. 166 // then verify that video is received on pc3 and pc4.
170 // The stream sent from pc3 to pc4 is the stream received on pc1. 167 // The stream sent from pc3 to pc4 is the stream received on pc1.
171 // The stream sent from pc4 to pc3 is cloned from stream the stream received 168 // The stream sent from pc4 to pc3 is cloned from stream the stream received
(...skipping 366 matching lines...) Expand 10 before | Expand all | Expand 10 after
538 535
539 base::DeleteFile(unique_dump_file, false); 536 base::DeleteFile(unique_dump_file, false);
540 } 537 }
541 } 538 }
542 539
543 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, CreateOfferWithOfferOptions) { 540 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, CreateOfferWithOfferOptions) {
544 MakeTypicalPeerConnectionCall("testCreateOfferOptions();"); 541 MakeTypicalPeerConnectionCall("testCreateOfferOptions();");
545 } 542 }
546 543
547 } // namespace content 544 } // 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