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

Unified Diff: content/renderer/media/rtc_peer_connection_handler_unittest.cc

Issue 155853002: Chrome MediaStream VideoTrack implementation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More cleanup. Created 6 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/rtc_peer_connection_handler_unittest.cc
diff --git a/content/renderer/media/rtc_peer_connection_handler_unittest.cc b/content/renderer/media/rtc_peer_connection_handler_unittest.cc
index 293a327026ef4ebeeff76e8984ec02ffd2db3797..7f0dc36d4ef4fbf4f917cd30fbb62b12896e9536 100644
--- a/content/renderer/media/rtc_peer_connection_handler_unittest.cc
+++ b/content/renderer/media/rtc_peer_connection_handler_unittest.cc
@@ -230,9 +230,11 @@ class RTCPeerConnectionHandlerTest : public ::testing::Test {
video_source.initialize(blink::WebString::fromUTF8(video_track_label),
blink::WebMediaStreamSource::TypeVideo,
blink::WebString::fromUTF8("video_track"));
- video_source.setExtraData(
+ MockMediaStreamVideoSource* native_video_source =
new MockMediaStreamVideoSource(mock_dependency_factory_.get(),
- false));
+ false);
+ video_source.setExtraData(native_video_source);
+
blink::WebVector<blink::WebMediaStreamTrack> audio_tracks(
static_cast<size_t>(1));
@@ -246,7 +248,16 @@ class RTCPeerConnectionHandlerTest : public ::testing::Test {
static_cast<size_t>(1));
video_tracks[0].initialize(video_source.id(), video_source);
video_tracks[0].setExtraData(
- new MediaStreamVideoTrack(mock_dependency_factory_.get()));
+ new MediaStreamVideoTrack(
+ native_video_source,
+ mock_dependency_factory_.get()));
+
+ blink::WebMediaConstraints constraints;
+ constraints.initialize();
+ native_video_source->AddTrack(
+ video_tracks[0],
+ constraints,
+ MediaStreamVideoSource::ConstraintsCallback());
blink::WebMediaStream local_stream;
local_stream.initialize(base::UTF8ToUTF16(stream_label), audio_tracks,

Powered by Google App Engine
This is Rietveld 408576698