| Index: remoting/host/client_session.cc
|
| diff --git a/remoting/host/client_session.cc b/remoting/host/client_session.cc
|
| index b79d7b142b5fc8fbe425e68351212e45a0368c59..6651c05e712236498c56303af8d97a8b91faa225 100644
|
| --- a/remoting/host/client_session.cc
|
| +++ b/remoting/host/client_session.cc
|
| @@ -74,7 +74,7 @@ ClientSession::ClientSession(
|
| scoped_refptr<protocol::PairingRegistry> pairing_registry,
|
| const std::vector<HostExtension*>& extensions)
|
| : event_handler_(event_handler),
|
| - connection_(connection.Pass()),
|
| + connection_(std::move(connection)),
|
| client_jid_(connection_->session()->jid()),
|
| desktop_environment_factory_(desktop_environment_factory),
|
| input_tracker_(&host_input_filter_),
|
| @@ -342,7 +342,7 @@ void ClientSession::OnConnectionChannelsConnected(
|
| CreateAudioEncoder(connection_->session()->config());
|
| audio_pump_.reset(new AudioPump(
|
| audio_task_runner_, desktop_environment_->CreateAudioCapturer(),
|
| - audio_encoder.Pass(), connection_->audio_stub()));
|
| + std::move(audio_encoder), connection_->audio_stub()));
|
| }
|
|
|
| // Notify the event handler that all our channels are now connected.
|
| @@ -463,9 +463,9 @@ void ClientSession::ResetVideoPipeline() {
|
| // TODO(sergeyu): Move DesktopCapturerProxy creation to DesktopEnvironment.
|
| // When using IpcDesktopCapturer the capture thread is not useful.
|
| scoped_ptr<webrtc::DesktopCapturer> capturer_proxy(new DesktopCapturerProxy(
|
| - video_capture_task_runner_, video_capturer.Pass()));
|
| + video_capture_task_runner_, std::move(video_capturer)));
|
|
|
| - video_stream_ = connection_->StartVideoStream(capturer_proxy.Pass());
|
| + video_stream_ = connection_->StartVideoStream(std::move(capturer_proxy));
|
| video_stream_->SetSizeCallback(
|
| base::Bind(&ClientSession::OnScreenSizeChanged, base::Unretained(this)));
|
|
|
|
|