Index: webrtc/modules/audio_processing/test/audio_file_processor.cc |
diff --git a/webrtc/modules/audio_processing/test/audio_file_processor.cc b/webrtc/modules/audio_processing/test/audio_file_processor.cc |
index 56e9b4b96ffc27b084cdd0babdc8720e0c95643f..5febcd0dc84a8dc5eeb2d8833f5ab29aa0bdc23e 100644 |
--- a/webrtc/modules/audio_processing/test/audio_file_processor.cc |
+++ b/webrtc/modules/audio_processing/test/audio_file_processor.cc |
@@ -16,7 +16,6 @@ |
#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; |
@@ -41,9 +40,9 @@ ChannelBuffer<float> GetChannelBuffer(const WavFile& file) { |
} // namespace |
-WavFileProcessor::WavFileProcessor(scoped_ptr<AudioProcessing> ap, |
- scoped_ptr<WavReader> in_file, |
- scoped_ptr<WavWriter> out_file) |
+WavFileProcessor::WavFileProcessor(std::unique_ptr<AudioProcessing> ap, |
+ std::unique_ptr<WavReader> in_file, |
+ std::unique_ptr<WavWriter> out_file) |
: ap_(std::move(ap)), |
in_buf_(GetChannelBuffer(*in_file)), |
out_buf_(GetChannelBuffer(*out_file)), |
@@ -66,9 +65,9 @@ bool WavFileProcessor::ProcessChunk() { |
return true; |
} |
-AecDumpFileProcessor::AecDumpFileProcessor(scoped_ptr<AudioProcessing> ap, |
+AecDumpFileProcessor::AecDumpFileProcessor(std::unique_ptr<AudioProcessing> ap, |
FILE* dump_file, |
- scoped_ptr<WavWriter> out_file) |
+ std::unique_ptr<WavWriter> out_file) |
: ap_(std::move(ap)), |
dump_file_(dump_file), |
out_buf_(GetChannelBuffer(*out_file)), |