Index: media/base/audio_splicer_unittest.cc |
diff --git a/media/base/audio_splicer_unittest.cc b/media/base/audio_splicer_unittest.cc |
index 5d556006fb59ed3bb76c2c64b28f7de2caa03a3e..f7fc79fe9a9e0c01e16807a54178242cdb3e7758 100644 |
--- a/media/base/audio_splicer_unittest.cc |
+++ b/media/base/audio_splicer_unittest.cc |
@@ -2,11 +2,13 @@ |
// 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 <memory> |
+ |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "media/base/audio_buffer.h" |
#include "media/base/audio_bus.h" |
-#include "media/base/audio_splicer.h" |
#include "media/base/audio_timestamp_helper.h" |
#include "media/base/test_helpers.h" |
#include "media/base/timestamp_constants.h" |
@@ -55,7 +57,7 @@ class AudioSplicerTest : public ::testing::Test { |
bool VerifyData(const scoped_refptr<AudioBuffer>& buffer, float value) { |
int frames = buffer->frame_count(); |
- scoped_ptr<AudioBus> bus = AudioBus::Create(kChannels, frames); |
+ std::unique_ptr<AudioBus> bus = AudioBus::Create(kChannels, frames); |
buffer->ReadFrames(frames, 0, 0, bus.get()); |
for (int ch = 0; ch < buffer->channel_count(); ++ch) { |
for (int i = 0; i < frames; ++i) { |
@@ -110,7 +112,7 @@ class AudioSplicerTest : public ::testing::Test { |
const int frames = crossfade_output->frame_count(); |
float overlapped_value = GetValue(overlapped_buffer_1); |
const float overlapping_value = GetValue(overlapping_buffer); |
- scoped_ptr<AudioBus> bus = AudioBus::Create(kChannels, frames); |
+ std::unique_ptr<AudioBus> bus = AudioBus::Create(kChannels, frames); |
crossfade_output->ReadFrames(frames, 0, 0, bus.get()); |
for (int ch = 0; ch < crossfade_output->channel_count(); ++ch) { |
float cf_ratio = 0; |