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

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

Issue 14200016: Added implementation of RemoteMediaStreams. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix nits Created 7 years, 8 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/content_renderer.gypi » ('j') | content/content_renderer.gypi » ('J')
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/utf_string_conversions.h" 6 #include "base/utf_string_conversions.h"
7 #include "content/browser/web_contents/web_contents_impl.h" 7 #include "content/browser/web_contents/web_contents_impl.h"
8 #include "content/public/common/content_switches.h" 8 #include "content/public/common/content_switches.h"
9 #include "content/public/test/browser_test_utils.h" 9 #include "content/public/test/browser_test_utils.h"
10 #include "content/shell/shell.h" 10 #include "content/shell/shell.h"
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 // MediaStream that has been created based on a MediaStream created with 160 // MediaStream that has been created based on a MediaStream created with
161 // getUserMedia. 161 // getUserMedia.
162 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, CallWithNewVideoMediaStream) { 162 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, CallWithNewVideoMediaStream) {
163 GURL url(test_server()->GetURL("files/media/peerconnection-call.html")); 163 GURL url(test_server()->GetURL("files/media/peerconnection-call.html"));
164 NavigateToURL(shell(), url); 164 NavigateToURL(shell(), url);
165 165
166 EXPECT_TRUE(ExecuteJavascript("callWithNewVideoMediaStream();")); 166 EXPECT_TRUE(ExecuteJavascript("callWithNewVideoMediaStream();"));
167 ExpectTitle("OK"); 167 ExpectTitle("OK");
168 } 168 }
169 169
170 // This test will make a PeerConnection-based call and send a new Video
171 // MediaStream that has been created based on a MediaStream created with
172 // getUserMedia. When video is flowing, the VideoTrack is removed and an
173 // AudioTrack is added instead.
174 // TODO(phoglund): This test is manual since not all buildbots has an audio
175 // input.
176 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MANUAL_CallAndModifyStream) {
177 GURL url(test_server()->GetURL("files/media/peerconnection-call.html"));
178 NavigateToURL(shell(), url);
179
180 EXPECT_TRUE(
181 ExecuteJavascript("callWithNewVideoMediaStreamLaterSwitchToAudio();"));
182 ExpectTitle("OK");
183 }
184
170 } // namespace content 185 } // namespace content
171 186
OLDNEW
« no previous file with comments | « no previous file | content/content_renderer.gypi » ('j') | content/content_renderer.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698