Use std::move() instead of scoped_ptr<>::Pass().

remoting/protocol/ice_connection_to_client.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/protocol/ice_connection_to_client.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "net/base/io_buffer.h"
 #include "remoting/codec/video_encoder.h"
@@ skipping 11 matching lines @@
 namespace remoting {
 namespace protocol {
 
 namespace {
 
 scoped_ptr<VideoEncoder> CreateVideoEncoder(
     const protocol::SessionConfig& config) {
   const protocol::ChannelConfig& video_config = config.video_config();
 
   if (video_config.codec == protocol::ChannelConfig::CODEC_VP8) {
-    return VideoEncoderVpx::CreateForVP8().Pass();
+    return VideoEncoderVpx::CreateForVP8();
   } else if (video_config.codec == protocol::ChannelConfig::CODEC_VP9) {
-    return VideoEncoderVpx::CreateForVP9().Pass();
+    return VideoEncoderVpx::CreateForVP9();
   } else if (video_config.codec == protocol::ChannelConfig::CODEC_VERBATIM) {
     return make_scoped_ptr(new VideoEncoderVerbatim());
   }
 
   NOTREACHED();
   return nullptr;
 }
 
 }  // namespace
 
 IceConnectionToClient::IceConnectionToClient(
     scoped_ptr<protocol::Session> session,
     scoped_refptr<base::SingleThreadTaskRunner> video_encode_task_runner)
     : event_handler_(nullptr),
-      session_(session.Pass()),
+      session_(std::move(session)),
       video_encode_task_runner_(video_encode_task_runner),
       control_dispatcher_(new HostControlDispatcher()),
       event_dispatcher_(new HostEventDispatcher()),
       video_dispatcher_(new HostVideoDispatcher()) {
   session_->SetEventHandler(this);
 }
 
 IceConnectionToClient::~IceConnectionToClient() {}
 
 void IceConnectionToClient::SetEventHandler(
@@ skipping 25 matching lines @@
 scoped_ptr<VideoStream> IceConnectionToClient::StartVideoStream(
     scoped_ptr<webrtc::DesktopCapturer> desktop_capturer) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   scoped_ptr<VideoEncoder> video_encoder =
       CreateVideoEncoder(session_->config());
   event_handler_->OnCreateVideoEncoder(&video_encoder);
   DCHECK(video_encoder);
 
   scoped_ptr<VideoFramePump> pump(
-      new VideoFramePump(video_encode_task_runner_, desktop_capturer.Pass(),
-                         video_encoder.Pass(), video_dispatcher_.get()));
+      new VideoFramePump(video_encode_task_runner_, std::move(desktop_capturer),
+                         std::move(video_encoder), video_dispatcher_.get()));
   video_dispatcher_->set_video_feedback_stub(pump->video_feedback_stub());
-  return pump.Pass();
+  return std::move(pump);

[Jamie, 2015/12/22 12:23:36]

Unnecessary?

[Sergey Ulanov, 2015/12/22 18:07:35]

Upcasting to VideoStream.

BTW the compiler (at least clang) throws a warning when using unnecessary
std::move() in a return statement.

 }
 
 AudioStub* IceConnectionToClient::audio_stub() {
   DCHECK(thread_checker_.CalledOnValidThread());
   return audio_writer_.get();
 }
 
 // Return pointer to ClientStub.
 ClientStub* IceConnectionToClient::client_stub() {
   DCHECK(thread_checker_.CalledOnValidThread());
@@ skipping 112 matching lines @@
 
 void IceConnectionToClient::CloseChannels() {
   control_dispatcher_.reset();
   event_dispatcher_.reset();
   video_dispatcher_.reset();
   audio_writer_.reset();
 }
 
 }  // namespace protocol
 }  // namespace remoting