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

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

Issue 14312015: Effects Pepper Plugin and MediaStream Glue. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 7 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
===================================================================
--- content/renderer/media/rtc_peer_connection_handler_unittest.cc (revision 198365)
+++ content/renderer/media/rtc_peer_connection_handler_unittest.cc (working copy)
@@ -127,7 +127,7 @@
public:
MOCK_METHOD1(UnregisterPeerConnection,
void(RTCPeerConnectionHandler* pc_handler));
- // TODO (jiayl): add coverage for the following methods
+ // TODO(jiayl): add coverage for the following methods
MOCK_METHOD2(TrackCreateOffer,
void(RTCPeerConnectionHandler* pc_handler,
const RTCMediaConstraints& constraints));
@@ -177,7 +177,7 @@
MOCK_METHOD1(TrackOnRenegotiationNeeded,
void(RTCPeerConnectionHandler* pc_handler));
MOCK_METHOD2(TrackCreateDTMFSender,
- void (RTCPeerConnectionHandler* pc_handler,
+ void(RTCPeerConnectionHandler* pc_handler,
const WebKit::WebMediaStreamTrack& track));
};
@@ -248,9 +248,10 @@
WebKit::WebVector<WebKit::WebMediaStreamTrack> video_tracks;
local_stream.audioSources(video_tracks);
const std::string video_track_id = UTF16ToUTF8(video_tracks[0].id());
+ webrtc::VideoSourceInterface* source = NULL;
scoped_refptr<webrtc::VideoTrackInterface> video_track(
mock_dependency_factory_->CreateLocalVideoTrack(
- video_track_id, 0));
+ video_track_id, source));
native_stream->AddTrack(video_track);
local_stream.setExtraData(new MediaStreamExtraData(native_stream, true));
@@ -266,9 +267,10 @@
scoped_refptr<webrtc::MediaStreamInterface> stream(
mock_dependency_factory_->CreateLocalMediaStream(stream_label));
if (!video_track_label.empty()) {
+ webrtc::VideoSourceInterface* source = NULL;
scoped_refptr<webrtc::VideoTrackInterface> video_track(
mock_dependency_factory_->CreateLocalVideoTrack(
- video_track_label, 0));
+ video_track_label, source));
stream->AddTrack(video_track);
}
if (!audio_track_label.empty()) {
« no previous file with comments | « content/renderer/media/mock_media_stream_registry.cc ('k') | content/renderer/media/video_destination_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698