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

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

Issue 1853793002: Prepare to remove webrtc::MediaStreamTrackInterface::set_state (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/renderer/media/webrtc/media_stream_remote_video_source_unittest.cc » ('j') | 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 696030b7c996e8824d38c65f0845868052ae832d..7663faee9c55e9a8930c6c109eef150922dff955 100644
--- a/content/renderer/media/rtc_peer_connection_handler_unittest.cc
+++ b/content/renderer/media/rtc_peer_connection_handler_unittest.cc
@@ -294,16 +294,10 @@ class RTCPeerConnectionHandlerTest : public ::testing::Test {
scoped_refptr<webrtc::MediaStreamInterface> stream(
mock_dependency_factory_->CreateLocalMediaStream(stream_label));
if (!video_track_label.empty()) {
- webrtc::VideoTrackSourceInterface* source = NULL;
- scoped_refptr<webrtc::VideoTrackInterface> video_track(
- mock_dependency_factory_->CreateLocalVideoTrack(
- video_track_label, source));
- stream->AddTrack(video_track.get());
+ stream->AddTrack(MockWebRtcVideoTrack::Create(video_track_label).get());
}
if (!audio_track_label.empty()) {
- scoped_refptr<webrtc::AudioTrackInterface> audio_track(
- WebRtcLocalAudioTrackAdapter::Create(audio_track_label, NULL));
- stream->AddTrack(audio_track.get());
+ stream->AddTrack(MockWebRtcAudioTrack::Create(audio_track_label).get());
}
mock_peer_connection_->AddRemoteStream(stream.get());
return stream;
@@ -800,14 +794,14 @@ TEST_F(RTCPeerConnectionHandlerTest, RemoteTrackState) {
EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateLive,
video_tracks[0].source().getReadyState());
- remote_stream->GetAudioTracks()[0]->set_state(
- webrtc::MediaStreamTrackInterface::kEnded);
+ static_cast<MockWebRtcAudioTrack*>(remote_stream->GetAudioTracks()[0].get())
+ ->SetEnded();
base::RunLoop().RunUntilIdle();
EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateEnded,
audio_tracks[0].source().getReadyState());
- remote_stream->GetVideoTracks()[0]->set_state(
- webrtc::MediaStreamTrackInterface::kEnded);
+ static_cast<MockWebRtcVideoTrack*>(remote_stream->GetVideoTracks()[0].get())
+ ->SetEnded();
base::RunLoop().RunUntilIdle();
EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateEnded,
video_tracks[0].source().getReadyState());
« no previous file with comments | « no previous file | content/renderer/media/webrtc/media_stream_remote_video_source_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698