Index: remoting/protocol/webrtc_connection_to_client.cc |
diff --git a/remoting/protocol/webrtc_connection_to_client.cc b/remoting/protocol/webrtc_connection_to_client.cc |
index 2b34482feb919403dddf211dd9008a39ec250ee4..628054e3b01632050ec6a4563ca760ae80799835 100644 |
--- a/remoting/protocol/webrtc_connection_to_client.cc |
+++ b/remoting/protocol/webrtc_connection_to_client.cc |
@@ -74,7 +74,7 @@ scoped_ptr<VideoStream> WebrtcConnectionToClient::StartVideoStream( |
CHECK(transport); |
scoped_ptr<WebrtcVideoCapturerAdapter> video_capturer_adapter( |
- new WebrtcVideoCapturerAdapter(desktop_capturer.Pass())); |
+ new WebrtcVideoCapturerAdapter(std::move(desktop_capturer))); |
// Set video stream constraints. |
webrtc::FakeConstraints video_constraints; |
@@ -96,9 +96,8 @@ scoped_ptr<VideoStream> WebrtcConnectionToClient::StartVideoStream( |
return nullptr; |
} |
- scoped_ptr<VideoStream> result( |
+ return make_scoped_ptr( |
new WebrtcVideoStream(transport->peer_connection(), video_stream)); |
- return result.Pass(); |
} |
AudioStub* WebrtcConnectionToClient::audio_stub() { |