| Index: content/renderer/media/peer_connection_handler_jsep_unittest.cc
|
| diff --git a/content/renderer/media/peer_connection_handler_jsep_unittest.cc b/content/renderer/media/peer_connection_handler_jsep_unittest.cc
|
| index 483d0311908d66cb96c28c9440e59c6689bf4fcc..5005344ae11cf887bf3a2e18246a79735dea5ce3 100644
|
| --- a/content/renderer/media/peer_connection_handler_jsep_unittest.cc
|
| +++ b/content/renderer/media/peer_connection_handler_jsep_unittest.cc
|
| @@ -66,15 +66,15 @@ class PeerConnectionHandlerJsepTest : public ::testing::Test {
|
| std::string audio_track_label("audio-label");
|
|
|
| talk_base::scoped_refptr<webrtc::LocalMediaStreamInterface> native_stream(
|
| - mock_dependency_factory_->CreateLocalMediaStream(stream_label));
|
| + mock_dependency_factory_->CreateLocalMediaStream(stream_label).get());
|
| talk_base::scoped_refptr<webrtc::LocalAudioTrackInterface> audio_track(
|
| mock_dependency_factory_->CreateLocalAudioTrack(audio_track_label,
|
| - NULL));
|
| - native_stream->AddTrack(audio_track);
|
| + NULL).get());
|
| + native_stream->AddTrack(audio_track.get());
|
| talk_base::scoped_refptr<webrtc::LocalVideoTrackInterface> video_track(
|
| mock_dependency_factory_->CreateLocalVideoTrack(
|
| - video_track_label, 0));
|
| - native_stream->AddTrack(video_track);
|
| + video_track_label, 0).get());
|
| + native_stream->AddTrack(video_track.get());
|
|
|
| WebKit::WebVector<WebKit::WebMediaStreamSource> audio_sources(
|
| static_cast<size_t>(1));
|
| @@ -89,7 +89,7 @@ class PeerConnectionHandlerJsepTest : public ::testing::Test {
|
| WebKit::WebMediaStreamDescriptor local_stream;
|
| local_stream.initialize(UTF8ToUTF16(stream_label), audio_sources,
|
| video_sources);
|
| - local_stream.setExtraData(new MediaStreamExtraData(native_stream));
|
| + local_stream.setExtraData(new MediaStreamExtraData(native_stream.get()));
|
| return local_stream;
|
| }
|
|
|
| @@ -102,20 +102,20 @@ class PeerConnectionHandlerJsepTest : public ::testing::Test {
|
| // We use a local stream as a remote since for testing purposes we really
|
| // only need the MediaStreamInterface.
|
| talk_base::scoped_refptr<webrtc::LocalMediaStreamInterface> stream(
|
| - mock_dependency_factory_->CreateLocalMediaStream(stream_label));
|
| + mock_dependency_factory_->CreateLocalMediaStream(stream_label).get());
|
| if (!video_track_label.empty()) {
|
| talk_base::scoped_refptr<webrtc::LocalVideoTrackInterface> video_track(
|
| mock_dependency_factory_->CreateLocalVideoTrack(
|
| - video_track_label, 0));
|
| - stream->AddTrack(video_track);
|
| + video_track_label, 0).get());
|
| + stream->AddTrack(video_track.get());
|
| }
|
| if (!audio_track_label.empty()) {
|
| talk_base::scoped_refptr<webrtc::LocalAudioTrackInterface> audio_track(
|
| mock_dependency_factory_->CreateLocalAudioTrack(audio_track_label,
|
| - NULL));
|
| - stream->AddTrack(audio_track);
|
| + NULL).get());
|
| + stream->AddTrack(audio_track.get());
|
| }
|
| - mock_peer_connection_->AddRemoteStream(stream);
|
| + mock_peer_connection_->AddRemoteStream(stream.get());
|
| return stream;
|
| }
|
|
|
| @@ -228,7 +228,7 @@ TEST_F(PeerConnectionHandlerJsepTest, Basic) {
|
| std::string remote_stream_label("remote_stream");
|
| talk_base::scoped_refptr<webrtc::MediaStreamInterface> remote_stream(
|
| AddRemoteMockMediaStream(remote_stream_label, "video", "audio"));
|
| - pc_handler_->OnAddStream(remote_stream);
|
| + pc_handler_->OnAddStream(remote_stream.get());
|
| EXPECT_EQ(remote_stream_label, mock_client_->stream_label());
|
|
|
| // Remove stream.
|
| @@ -238,7 +238,7 @@ TEST_F(PeerConnectionHandlerJsepTest, Basic) {
|
| EXPECT_EQ("", mock_peer_connection_->stream_label());
|
|
|
| // On remove stream.
|
| - pc_handler_->OnRemoveStream(remote_stream);
|
| + pc_handler_->OnRemoveStream(remote_stream.get());
|
| EXPECT_TRUE(mock_client_->stream_label().empty());
|
|
|
| // Add stream again.
|
| @@ -299,10 +299,10 @@ TEST_F(PeerConnectionHandlerJsepTest, ReceiveMultipleRemoteStreams) {
|
| AddRemoteMockMediaStream(stream_label_2, video_track_label_2,
|
| audio_track_label_2));
|
|
|
| - pc_handler_->OnAddStream(stream_1);
|
| + pc_handler_->OnAddStream(stream_1.get());
|
| EXPECT_EQ(stream_label_1, mock_client_->stream_label());
|
|
|
| - pc_handler_->OnAddStream(stream_2);
|
| + pc_handler_->OnAddStream(stream_2.get());
|
| EXPECT_EQ(stream_label_2, mock_client_->stream_label());
|
| }
|
|
|
|
|