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

media/cast/receiver/cast_receiver_impl.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/cast/receiver/cast_receiver_impl.h"
 
 #include <stddef.h>
+#include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/trace_event/trace_event.h"
 #include "media/cast/receiver/audio_decoder.h"
 #include "media/cast/receiver/video_decoder.h"
 
@@ skipping 104 matching lines @@
   if (!audio_decoder_) {
     audio_decoder_.reset(new AudioDecoder(cast_environment_,
                                           num_audio_channels_,
                                           audio_sampling_rate_,
                                           audio_codec_));
   }
   const uint32_t frame_id = encoded_frame->frame_id;
   const uint32_t rtp_timestamp = encoded_frame->rtp_timestamp;
   const base::TimeTicks playout_time = encoded_frame->reference_time;
   audio_decoder_->DecodeFrame(
-      encoded_frame.Pass(),
-      base::Bind(&CastReceiverImpl::EmitDecodedAudioFrame,
-                 cast_environment_,
-                 callback,
-                 frame_id,
-                 rtp_timestamp,
-                 playout_time));
+      std::move(encoded_frame),
+      base::Bind(&CastReceiverImpl::EmitDecodedAudioFrame, cast_environment_,
+                 callback, frame_id, rtp_timestamp, playout_time));
 }
 
 void CastReceiverImpl::DecodeEncodedVideoFrame(
     const VideoFrameDecodedCallback& callback,
     scoped_ptr<EncodedFrame> encoded_frame) {
   DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
   if (!encoded_frame) {
     callback.Run(
         make_scoped_refptr<VideoFrame>(NULL), base::TimeTicks(), false);
     return;
   }
 
   // Used by chrome/browser/extension/api/cast_streaming/performance_test.cc
   TRACE_EVENT_INSTANT2(
       "cast_perf_test", "PullEncodedVideoFrame",
       TRACE_EVENT_SCOPE_THREAD,
       "rtp_timestamp", encoded_frame->rtp_timestamp,
       "render_time", encoded_frame->reference_time.ToInternalValue());
 
   if (!video_decoder_)
     video_decoder_.reset(new VideoDecoder(cast_environment_, video_codec_));
   const uint32_t frame_id = encoded_frame->frame_id;
   const uint32_t rtp_timestamp = encoded_frame->rtp_timestamp;
   const base::TimeTicks playout_time = encoded_frame->reference_time;
   video_decoder_->DecodeFrame(
-      encoded_frame.Pass(),
-      base::Bind(&CastReceiverImpl::EmitDecodedVideoFrame,
-                 cast_environment_,
-                 callback,
-                 frame_id,
-                 rtp_timestamp,
-                 playout_time));
+      std::move(encoded_frame),
+      base::Bind(&CastReceiverImpl::EmitDecodedVideoFrame, cast_environment_,
+                 callback, frame_id, rtp_timestamp, playout_time));
 }
 
 // static
 void CastReceiverImpl::EmitDecodedAudioFrame(
     const scoped_refptr<CastEnvironment>& cast_environment,
     const AudioFrameDecodedCallback& callback,
     uint32_t frame_id,
     uint32_t rtp_timestamp,
     const base::TimeTicks& playout_time,
     scoped_ptr<AudioBus> audio_bus,
     bool is_continuous) {
   DCHECK(cast_environment->CurrentlyOn(CastEnvironment::MAIN));
 
   if (audio_bus.get()) {
     // TODO(miu): This is reporting incorrect timestamp and delay.
     // http://crbug.com/547251
     scoped_ptr<FrameEvent> playout_event(new FrameEvent());
     playout_event->timestamp = cast_environment->Clock()->NowTicks();
     playout_event->type = FRAME_PLAYOUT;
     playout_event->media_type = AUDIO_EVENT;
     playout_event->rtp_timestamp = rtp_timestamp;
     playout_event->frame_id = frame_id;
     playout_event->delay_delta = playout_time - playout_event->timestamp;
-    cast_environment->logger()->DispatchFrameEvent(playout_event.Pass());
+    cast_environment->logger()->DispatchFrameEvent(std::move(playout_event));
   }
 
-  callback.Run(audio_bus.Pass(), playout_time, is_continuous);
+  callback.Run(std::move(audio_bus), playout_time, is_continuous);
 }
 
 // static
 void CastReceiverImpl::EmitDecodedVideoFrame(
     const scoped_refptr<CastEnvironment>& cast_environment,
     const VideoFrameDecodedCallback& callback,
     uint32_t frame_id,
     uint32_t rtp_timestamp,
     const base::TimeTicks& playout_time,
     const scoped_refptr<VideoFrame>& video_frame,
     bool is_continuous) {
   DCHECK(cast_environment->CurrentlyOn(CastEnvironment::MAIN));
 
   if (video_frame.get()) {
     // TODO(miu): This is reporting incorrect timestamp and delay.
     // http://crbug.com/547251
     scoped_ptr<FrameEvent> playout_event(new FrameEvent());
     playout_event->timestamp = cast_environment->Clock()->NowTicks();
     playout_event->type = FRAME_PLAYOUT;
     playout_event->media_type = VIDEO_EVENT;
     playout_event->rtp_timestamp = rtp_timestamp;
     playout_event->frame_id = frame_id;
     playout_event->delay_delta = playout_time - playout_event->timestamp;
-    cast_environment->logger()->DispatchFrameEvent(playout_event.Pass());
+    cast_environment->logger()->DispatchFrameEvent(std::move(playout_event));
 
     // Used by chrome/browser/extension/api/cast_streaming/performance_test.cc
     TRACE_EVENT_INSTANT1(
         "cast_perf_test", "FrameDecoded",
         TRACE_EVENT_SCOPE_THREAD,
         "rtp_timestamp", rtp_timestamp);
   }
 
   callback.Run(video_frame, playout_time, is_continuous);
 }
 
 }  // namespace cast
 }  // namespace media