Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1166)

Unified Diff: media/audio/simple_sources_unittest.cc

Issue 1911913002: Convert //media/audio from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/audio/simple_sources.cc ('k') | media/audio/sounds/audio_stream_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/simple_sources_unittest.cc
diff --git a/media/audio/simple_sources_unittest.cc b/media/audio/simple_sources_unittest.cc
index 550ca0749e35dbbf5d46d4ab22f015785d4df8b9..521b7864e7af587c7f7878489a85f8133e733600 100644
--- a/media/audio/simple_sources_unittest.cc
+++ b/media/audio/simple_sources_unittest.cc
@@ -2,15 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "media/audio/simple_sources.h"
+
#include <stddef.h>
#include <stdint.h>
#include <limits>
+#include <memory>
#include "base/files/file_util.h"
#include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
-#include "media/audio/simple_sources.h"
#include "media/audio/sounds/test_data.h"
#include "media/base/audio_bus.h"
#include "media/base/audio_parameters.h"
@@ -29,7 +30,7 @@ TEST(SimpleSources, SineWaveAudioSource) {
AudioParameters::kTelephoneSampleRate, bytes_per_sample * 8, samples);
SineWaveAudioSource source(1, freq, params.sample_rate());
- scoped_ptr<AudioBus> audio_bus = AudioBus::Create(params);
+ std::unique_ptr<AudioBus> audio_bus = AudioBus::Create(params);
source.OnMoreData(audio_bus.get(), 0, 0);
EXPECT_EQ(1, source.callbacks());
EXPECT_EQ(0, source.errors());
@@ -58,7 +59,7 @@ TEST(SimpleSources, SineWaveAudioCapped) {
static const int kSampleCap = 100;
source.CapSamples(kSampleCap);
- scoped_ptr<AudioBus> audio_bus = AudioBus::Create(1, 2 * kSampleCap);
+ std::unique_ptr<AudioBus> audio_bus = AudioBus::Create(1, 2 * kSampleCap);
EXPECT_EQ(source.OnMoreData(audio_bus.get(), 0, 0), kSampleCap);
EXPECT_EQ(1, source.callbacks());
EXPECT_EQ(source.OnMoreData(audio_bus.get(), 0, 0), 0);
@@ -92,7 +93,7 @@ TEST(SimpleSources, FileSourceTestData) {
// Create AudioParameters which match those in the WAV data.
AudioParameters params(AudioParameters::AUDIO_PCM_LINEAR,
CHANNEL_LAYOUT_STEREO, 48000, 16, kNumFrames);
- scoped_ptr<AudioBus> audio_bus = AudioBus::Create(2, kNumFrames);
+ std::unique_ptr<AudioBus> audio_bus = AudioBus::Create(2, kNumFrames);
audio_bus->Zero();
// Create a FileSource that reads this file.
@@ -124,7 +125,7 @@ TEST(SimpleSources, FileSourceTestData) {
TEST(SimpleSources, BadFilePathFails) {
AudioParameters params(AudioParameters::AUDIO_PCM_LINEAR,
CHANNEL_LAYOUT_STEREO, 48000, 16, 10);
- scoped_ptr<AudioBus> audio_bus = AudioBus::Create(2, 10);
+ std::unique_ptr<AudioBus> audio_bus = AudioBus::Create(2, 10);
audio_bus->Zero();
// Create a FileSource that reads this file.
@@ -162,7 +163,7 @@ TEST(SimpleSources, FileSourceCorruptTestDataFails) {
// Create AudioParameters which match those in the WAV data.
AudioParameters params(AudioParameters::AUDIO_PCM_LINEAR,
CHANNEL_LAYOUT_STEREO, 48000, 16, kNumFrames);
- scoped_ptr<AudioBus> audio_bus = AudioBus::Create(2, kNumFrames);
+ std::unique_ptr<AudioBus> audio_bus = AudioBus::Create(2, kNumFrames);
audio_bus->Zero();
// Create a FileSource that reads this file.
« no previous file with comments | « media/audio/simple_sources.cc ('k') | media/audio/sounds/audio_stream_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698