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

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: Removed whitespaces... Created 6 years, 9 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
« no previous file with comments | « content/renderer/media/media_stream_video_track_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..c2b21dc0040a57da6af0783601748c0aac5113ed 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));
@@ -244,9 +246,12 @@ class RTCPeerConnectionHandlerTest : public ::testing::Test {
true));
blink::WebVector<blink::WebMediaStreamTrack> video_tracks(
static_cast<size_t>(1));
- video_tracks[0].initialize(video_source.id(), video_source);
- video_tracks[0].setExtraData(
- new MediaStreamVideoTrack(mock_dependency_factory_.get()));
+ blink::WebMediaConstraints constraints;
+ constraints.initialize();
+ video_tracks[0] = MediaStreamVideoTrack::CreateVideoTrack(
+ native_video_source, constraints,
+ MediaStreamVideoSource::ConstraintsCallback(), true,
+ mock_dependency_factory_.get());
blink::WebMediaStream local_stream;
local_stream.initialize(base::UTF8ToUTF16(stream_label), audio_tracks,
« no previous file with comments | « content/renderer/media/media_stream_video_track_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698