Use std::move() instead of .Pass() in remoting/*

remoting/client/software_video_renderer.cc

 // Copyright 2014 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/client/software_video_renderer.h"
 
+#include <utility>
+
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/callback_helpers.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
 #include "base/task_runner_util.h"
 #include "remoting/base/util.h"
 #include "remoting/client/frame_consumer.h"
 #include "remoting/codec/video_decoder.h"
@@ skipping 11 matching lines @@
 
 namespace {
 
 // This class wraps a VideoDecoder and byte-swaps the pixels for compatibility
 // with the android.graphics.Bitmap class.
 // TODO(lambroslambrou): Refactor so that the VideoDecoder produces data
 // in the right byte-order, instead of swapping it here.
 class RgbToBgrVideoDecoderFilter : public VideoDecoder {
  public:
   RgbToBgrVideoDecoderFilter(scoped_ptr<VideoDecoder> parent)
-      : parent_(parent.Pass()) {
-  }
+      : parent_(std::move(parent)) {}
 
   bool DecodePacket(const VideoPacket& packet,
                     webrtc::DesktopFrame* frame) override {
     if (!parent_->DecodePacket(packet, frame))
       return false;
     for (webrtc::DesktopRegion::Iterator i(frame->updated_region());
          !i.IsAtEnd(); i.Advance()) {
       webrtc::DesktopRect rect = i.rect();
       uint8_t* pixels = frame->data() + (rect.top() * frame->stride()) +
                         (rect.left() * webrtc::DesktopFrame::kBytesPerPixel);
       libyuv::ABGRToARGB(pixels, frame->stride(), pixels, frame->stride(),
                          rect.width(), rect.height());
     }
 
     return true;
   }
 
  private:
   scoped_ptr<VideoDecoder> parent_;
 };
 
 scoped_ptr<webrtc::DesktopFrame> DoDecodeFrame(
     VideoDecoder* decoder,
     scoped_ptr<VideoPacket> packet,
     scoped_ptr<webrtc::DesktopFrame> frame) {
   if (!decoder->DecodePacket(*packet, frame.get()))
     frame.reset();
-  return frame.Pass();
+  return frame;
 }
 
 }  // namespace
 
 SoftwareVideoRenderer::SoftwareVideoRenderer(
     scoped_refptr<base::SingleThreadTaskRunner> decode_task_runner,
     FrameConsumer* consumer,
     protocol::PerformanceTracker* perf_tracker)
     : decode_task_runner_(decode_task_runner),
       consumer_(consumer),
@@ skipping 15 matching lines @@
     decoder_.reset(new VideoDecoderVerbatim());
   } else if (codec == ChannelConfig::CODEC_VP8) {
     decoder_ = VideoDecoderVpx::CreateForVP8();
   } else if (codec == ChannelConfig::CODEC_VP9) {
     decoder_ = VideoDecoderVpx::CreateForVP9();
   } else {
     NOTREACHED() << "Invalid Encoding found: " << codec;
   }
 
   if (consumer_->GetPixelFormat() == FrameConsumer::FORMAT_RGBA) {
-    scoped_ptr<VideoDecoder> wrapper(
-        new RgbToBgrVideoDecoderFilter(decoder_.Pass()));
-    decoder_ = wrapper.Pass();
+    decoder_ =
+        make_scoped_ptr(new RgbToBgrVideoDecoderFilter(std::move(decoder_)));
   }
 }
 
 protocol::VideoStub* SoftwareVideoRenderer::GetVideoStub() {
   DCHECK(thread_checker_.CalledOnValidThread());
   return this;
 }
 
 void SoftwareVideoRenderer::ProcessVideoPacket(scoped_ptr<VideoPacket> packet,
                                                const base::Closure& done) {
@@ skipping 50 matching lines @@
 
   if (perf_tracker_)
     perf_tracker_->OnFrameDecoded(frame_id);
 
   if (!frame) {
     if (!done.is_null())
       done.Run();
     return;
   }
 
-  consumer_->DrawFrame(frame.Pass(),
+  consumer_->DrawFrame(std::move(frame),
                        base::Bind(&SoftwareVideoRenderer::OnFrameRendered,
                                   weak_factory_.GetWeakPtr(), frame_id, done));
 }
 
 void SoftwareVideoRenderer::OnFrameRendered(int32_t frame_id,
                                             const base::Closure& done) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   if (perf_tracker_)
     perf_tracker_->OnFramePainted(frame_id);
 
   if (!done.is_null())
     done.Run();
 }
 
 }  // namespace remoting