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

media/base/audio_splicer.cc

 // Copyright (c) 2012 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/base/audio_splicer.h"
 
 #include <stdint.h>
-
 #include <cstdlib>
 #include <deque>
+#include <utility>
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "media/base/audio_buffer.h"
 #include "media/base/audio_bus.h"
 #include "media/base/audio_decoder_config.h"
 #include "media/base/audio_timestamp_helper.h"
 #include "media/base/media_log.h"
 #include "media/base/vector_math.h"
 
@@ skipping 28 matching lines @@
 // Returns an AudioBus whose frame buffer is backed by the provided AudioBuffer.
 scoped_ptr<AudioBus> CreateAudioBufferWrapper(
     const scoped_refptr<AudioBuffer>& buffer) {
   scoped_ptr<AudioBus> wrapper =
       AudioBus::CreateWrapper(buffer->channel_count());
   wrapper->set_frames(buffer->frame_count());
   for (int ch = 0; ch < buffer->channel_count(); ++ch) {
     wrapper->SetChannelData(
         ch, reinterpret_cast<float*>(buffer->channel_data()[ch]));
   }
-  return wrapper.Pass();
+  return wrapper;
 }
 
 }  // namespace
 
 class AudioStreamSanitizer {
  public:
   AudioStreamSanitizer(int samples_per_second,
                        const scoped_refptr<MediaLog>& media_log);
   ~AudioStreamSanitizer();
 
@@ skipping 303 matching lines @@
       input->timestamp() + input->duration() < max_splice_end_timestamp_) {
     return true;
   }
 
   scoped_refptr<AudioBuffer> crossfade_buffer;
   scoped_ptr<AudioBus> pre_splice =
       ExtractCrossfadeFromPreSplice(&crossfade_buffer);
 
   // Crossfade the pre splice and post splice sections and transfer all relevant
   // buffers into |output_sanitizer_|.
-  CrossfadePostSplice(pre_splice.Pass(), crossfade_buffer);
+  CrossfadePostSplice(std::move(pre_splice), crossfade_buffer);
 
   // Clear the splice timestamp so new splices can be accepted.
   reset_splice_timestamps();
   return true;
 }
 
 bool AudioSplicer::HasNextBuffer() const {
   return output_sanitizer_->HasNextBuffer();
 }
 
@@ skipping 96 matching lines @@
   // Ensure outputs were properly allocated.  The method should not have been
   // called if there is not enough data to crossfade.
   // TODO(dalecurtis): Convert to DCHECK() once http://crbug.com/356073 fixed.
   CHECK(output_bus);
   CHECK(crossfade_buffer->get());
 
   // All necessary buffers have been processed, it's safe to reset.
   pre_splice_sanitizer_->Reset();
   DCHECK_EQ(output_bus->frames(), frames_read);
   DCHECK_EQ(output_ts_helper.GetFramesToTarget(splice_timestamp_), 0);
-  return output_bus.Pass();
+  return output_bus;
 }
 
 void AudioSplicer::CrossfadePostSplice(
     scoped_ptr<AudioBus> pre_splice_bus,
     const scoped_refptr<AudioBuffer>& crossfade_buffer) {
   // Use the calculated timestamp and duration to ensure there's no extra gaps
   // or overlaps to process when adding the buffer to |output_sanitizer_|.
   const AudioTimestampHelper& output_ts_helper =
       output_sanitizer_->timestamp_helper();
   crossfade_buffer->set_timestamp(output_ts_helper.GetTimestamp());
@@ skipping 40 matching lines @@
     AccurateTrimStart(frames_to_trim, remainder, output_ts_helper);
     CHECK(output_sanitizer_->AddInput(remainder));
   }
 
   // Transfer all remaining buffers out and reset once empty.
   CHECK(post_splice_sanitizer_->DrainInto(output_sanitizer_.get()));
   post_splice_sanitizer_->Reset();
 }
 
 }  // namespace media