| Index: webrtc/modules/audio_device/android/audio_device_unittest.cc
|
| diff --git a/webrtc/modules/audio_device/android/audio_device_unittest.cc b/webrtc/modules/audio_device/android/audio_device_unittest.cc
|
| index 768047df516182fc06c8afd7546ec94cd8882ae9..7655c820adab66bf0e7d7848fde758a0f3abc5e8 100644
|
| --- a/webrtc/modules/audio_device/android/audio_device_unittest.cc
|
| +++ b/webrtc/modules/audio_device/android/audio_device_unittest.cc
|
| @@ -11,6 +11,7 @@
|
| #include <algorithm>
|
| #include <limits>
|
| #include <list>
|
| +#include <memory>
|
| #include <numeric>
|
| #include <string>
|
| #include <vector>
|
| @@ -20,7 +21,6 @@
|
| #include "webrtc/base/arraysize.h"
|
| #include "webrtc/base/criticalsection.h"
|
| #include "webrtc/base/format_macros.h"
|
| -#include "webrtc/base/scoped_ptr.h"
|
| #include "webrtc/base/scoped_ref_ptr.h"
|
| #include "webrtc/modules/audio_device/android/audio_common.h"
|
| #include "webrtc/modules/audio_device/android/audio_manager.h"
|
| @@ -144,7 +144,7 @@ class FileAudioStream : public AudioStreamInterface {
|
| private:
|
| size_t file_size_in_bytes_;
|
| int sample_rate_;
|
| - rtc::scoped_ptr<int16_t[]> file_;
|
| + std::unique_ptr<int16_t[]> file_;
|
| size_t file_pos_;
|
| };
|
|
|
| @@ -239,7 +239,7 @@ class FifoAudioStream : public AudioStreamInterface {
|
| rtc::CriticalSection lock_;
|
| const size_t frames_per_buffer_;
|
| const size_t bytes_per_buffer_;
|
| - rtc::scoped_ptr<AudioBufferList> fifo_;
|
| + std::unique_ptr<AudioBufferList> fifo_;
|
| size_t largest_size_;
|
| size_t total_written_elements_;
|
| size_t write_count_;
|
| @@ -491,7 +491,7 @@ class MockAudioTransport : public AudioTransport {
|
| size_t play_count_;
|
| size_t rec_count_;
|
| AudioStreamInterface* audio_stream_;
|
| - rtc::scoped_ptr<LatencyMeasuringAudioStream> latency_audio_stream_;
|
| + std::unique_ptr<LatencyMeasuringAudioStream> latency_audio_stream_;
|
| };
|
|
|
| // AudioDeviceTest test fixture.
|
| @@ -688,11 +688,11 @@ class AudioDeviceTest : public ::testing::Test {
|
| return volume;
|
| }
|
|
|
| - rtc::scoped_ptr<EventWrapper> test_is_done_;
|
| + std::unique_ptr<EventWrapper> test_is_done_;
|
| rtc::scoped_refptr<AudioDeviceModule> audio_device_;
|
| AudioParameters playout_parameters_;
|
| AudioParameters record_parameters_;
|
| - rtc::scoped_ptr<BuildInfo> build_info_;
|
| + std::unique_ptr<BuildInfo> build_info_;
|
| };
|
|
|
| TEST_F(AudioDeviceTest, ConstructDestruct) {
|
| @@ -935,7 +935,7 @@ TEST_F(AudioDeviceTest, RunPlayoutWithFileAsSource) {
|
| NiceMock<MockAudioTransport> mock(kPlayout);
|
| const int num_callbacks = kFilePlayTimeInSec * kNumCallbacksPerSecond;
|
| std::string file_name = GetFileName(playout_sample_rate());
|
| - rtc::scoped_ptr<FileAudioStream> file_audio_stream(
|
| + std::unique_ptr<FileAudioStream> file_audio_stream(
|
| new FileAudioStream(num_callbacks, file_name, playout_sample_rate()));
|
| mock.HandleCallbacks(test_is_done_.get(),
|
| file_audio_stream.get(),
|
| @@ -964,7 +964,7 @@ TEST_F(AudioDeviceTest, RunPlayoutAndRecordingInFullDuplex) {
|
| EXPECT_EQ(record_channels(), playout_channels());
|
| EXPECT_EQ(record_sample_rate(), playout_sample_rate());
|
| NiceMock<MockAudioTransport> mock(kPlayout | kRecording);
|
| - rtc::scoped_ptr<FifoAudioStream> fifo_audio_stream(
|
| + std::unique_ptr<FifoAudioStream> fifo_audio_stream(
|
| new FifoAudioStream(playout_frames_per_10ms_buffer()));
|
| mock.HandleCallbacks(test_is_done_.get(),
|
| fifo_audio_stream.get(),
|
| @@ -994,7 +994,7 @@ TEST_F(AudioDeviceTest, DISABLED_MeasureLoopbackLatency) {
|
| EXPECT_EQ(record_channels(), playout_channels());
|
| EXPECT_EQ(record_sample_rate(), playout_sample_rate());
|
| NiceMock<MockAudioTransport> mock(kPlayout | kRecording);
|
| - rtc::scoped_ptr<LatencyMeasuringAudioStream> latency_audio_stream(
|
| + std::unique_ptr<LatencyMeasuringAudioStream> latency_audio_stream(
|
| new LatencyMeasuringAudioStream(playout_frames_per_10ms_buffer()));
|
| mock.HandleCallbacks(test_is_done_.get(),
|
| latency_audio_stream.get(),
|
|
|