Don't call the Pass methods of rtc::Buffer, rtc::scoped_ptr, and rtc::ScopedVector

webrtc/modules/audio_processing/test/audio_file_processor.cc

 /*
  *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include "webrtc/modules/audio_processing/test/audio_file_processor.h"
 
 #include <algorithm>
+#include <utility>
 
 #include "webrtc/base/checks.h"
 #include "webrtc/modules/audio_processing/test/protobuf_utils.h"
 
 using rtc::scoped_ptr;
 using rtc::CheckedDivExact;
 using std::vector;
 using webrtc::audioproc::Event;
 using webrtc::audioproc::Init;
 using webrtc::audioproc::ReverseStream;
@@ skipping 12 matching lines @@
   return ChannelBuffer<float>(
       CheckedDivExact(file.sample_rate(), AudioFileProcessor::kChunksPerSecond),
       file.num_channels());
 }
 
 }  // namespace
 
 WavFileProcessor::WavFileProcessor(scoped_ptr<AudioProcessing> ap,
                                    scoped_ptr<WavReader> in_file,
                                    scoped_ptr<WavWriter> out_file)
-    : ap_(ap.Pass()),
+    : ap_(std::move(ap)),
       in_buf_(GetChannelBuffer(*in_file)),
       out_buf_(GetChannelBuffer(*out_file)),
       input_config_(GetStreamConfig(*in_file)),
       output_config_(GetStreamConfig(*out_file)),
-      buffer_reader_(in_file.Pass()),
-      buffer_writer_(out_file.Pass()) {}
+      buffer_reader_(std::move(in_file)),
+      buffer_writer_(std::move(out_file)) {}
 
 bool WavFileProcessor::ProcessChunk() {
   if (!buffer_reader_.Read(&in_buf_)) {
     return false;
   }
   {
     const auto st = ScopedTimer(mutable_proc_time());
     RTC_CHECK_EQ(kNoErr,
                  ap_->ProcessStream(in_buf_.channels(), input_config_,
                                     output_config_, out_buf_.channels()));
   }
   buffer_writer_.Write(out_buf_);
   return true;
 }
 
 AecDumpFileProcessor::AecDumpFileProcessor(scoped_ptr<AudioProcessing> ap,
                                            FILE* dump_file,
                                            scoped_ptr<WavWriter> out_file)
-    : ap_(ap.Pass()),
+    : ap_(std::move(ap)),
       dump_file_(dump_file),
       out_buf_(GetChannelBuffer(*out_file)),
       output_config_(GetStreamConfig(*out_file)),
-      buffer_writer_(out_file.Pass()) {
+      buffer_writer_(std::move(out_file)) {
   RTC_CHECK(dump_file_) << "Could not open dump file for reading.";
 }
 
 AecDumpFileProcessor::~AecDumpFileProcessor() {
   fclose(dump_file_);
 }
 
 bool AecDumpFileProcessor::ProcessChunk() {
   Event event_msg;
 
@@ skipping 82 matching lines @@
     const auto st = ScopedTimer(mutable_proc_time());
     // TODO(ajm): This currently discards the processed output, which is needed
     // for e.g. intelligibility enhancement.
     RTC_CHECK_EQ(kNoErr, ap_->ProcessReverseStream(
                              reverse_buf_->channels(), reverse_config_,
                              reverse_config_, reverse_buf_->channels()));
   }
 }
 
 }  // namespace webrtc