Convert Pass()→std::move() in //media

media/mojo/services/mojo_demuxer_stream_adapter.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 "media/mojo/services/mojo_demuxer_stream_adapter.h"
 
 #include <stdint.h>
+#include <utility>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "media/base/decoder_buffer.h"
 #include "media/mojo/services/media_type_converters.h"
 #include "mojo/public/cpp/system/data_pipe.h"
 
 namespace media {
 
 MojoDemuxerStreamAdapter::MojoDemuxerStreamAdapter(
     interfaces::DemuxerStreamPtr demuxer_stream,
     const base::Closure& stream_ready_cb)
-    : demuxer_stream_(demuxer_stream.Pass()),
+    : demuxer_stream_(std::move(demuxer_stream)),
       stream_ready_cb_(stream_ready_cb),
       type_(DemuxerStream::UNKNOWN),
       weak_factory_(this) {
   DVLOG(1) << __FUNCTION__;
   demuxer_stream_->Initialize(base::Bind(
       &MojoDemuxerStreamAdapter::OnStreamReady, weak_factory_.GetWeakPtr()));
 }
 
 MojoDemuxerStreamAdapter::~MojoDemuxerStreamAdapter() {
   DVLOG(1) << __FUNCTION__;
@@ skipping 41 matching lines @@
 void MojoDemuxerStreamAdapter::OnStreamReady(
     interfaces::DemuxerStream::Type type,
     mojo::ScopedDataPipeConsumerHandle pipe,
     interfaces::AudioDecoderConfigPtr audio_config,
     interfaces::VideoDecoderConfigPtr video_config) {
   DVLOG(1) << __FUNCTION__;
   DCHECK(pipe.is_valid());
   DCHECK_EQ(DemuxerStream::UNKNOWN, type_);
 
   type_ = static_cast<DemuxerStream::Type>(type);
-  stream_pipe_ = pipe.Pass();
-  UpdateConfig(audio_config.Pass(), video_config.Pass());
+  stream_pipe_ = std::move(pipe);
+  UpdateConfig(std::move(audio_config), std::move(video_config));
 
   stream_ready_cb_.Run();
 }
 
 void MojoDemuxerStreamAdapter::OnBufferReady(
     interfaces::DemuxerStream::Status status,
     interfaces::DecoderBufferPtr buffer,
     interfaces::AudioDecoderConfigPtr audio_config,
     interfaces::VideoDecoderConfigPtr video_config) {
   DVLOG(3) << __FUNCTION__;
   DCHECK(!read_cb_.is_null());
   DCHECK_NE(type_, DemuxerStream::UNKNOWN);
   DCHECK(stream_pipe_.is_valid());
 
   if (status == interfaces::DemuxerStream::STATUS_CONFIG_CHANGED) {
-    UpdateConfig(audio_config.Pass(), video_config.Pass());
+    UpdateConfig(std::move(audio_config), std::move(video_config));
     base::ResetAndReturn(&read_cb_).Run(DemuxerStream::kConfigChanged, nullptr);
     return;
   }
 
   if (status == interfaces::DemuxerStream::STATUS_ABORTED) {
     base::ResetAndReturn(&read_cb_).Run(DemuxerStream::kAborted, nullptr);
     return;
   }
 
   DCHECK_EQ(status, interfaces::DemuxerStream::STATUS_OK);
@@ skipping 27 matching lines @@
     case DemuxerStream::VIDEO:
       DCHECK(video_config && !audio_config);
       video_config_ = video_config.To<VideoDecoderConfig>();
       break;
     default:
       NOTREACHED();
   }
 }
 
 }  // namespace media