| Index: media/audio/sounds/wav_audio_handler.cc
|
| diff --git a/media/audio/sounds/wav_audio_handler.cc b/media/audio/sounds/wav_audio_handler.cc
|
| index a7c2b1464fe0d42dff355b9f56692d2ee0ec22fe..8f934cc3ff835360ac44148520acc09f651dc2a8 100644
|
| --- a/media/audio/sounds/wav_audio_handler.cc
|
| +++ b/media/audio/sounds/wav_audio_handler.cc
|
| @@ -8,6 +8,7 @@
|
| #include <cstring>
|
|
|
| #include "base/logging.h"
|
| +#include "base/memory/ptr_util.h"
|
| #include "base/sys_byteorder.h"
|
| #include "build/build_config.h"
|
| #include "media/base/audio_bus.h"
|
| @@ -174,18 +175,18 @@ WavAudioHandler::WavAudioHandler(base::StringPiece audio_data,
|
| WavAudioHandler::~WavAudioHandler() {}
|
|
|
| // static
|
| -scoped_ptr<WavAudioHandler> WavAudioHandler::Create(
|
| +std::unique_ptr<WavAudioHandler> WavAudioHandler::Create(
|
| const base::StringPiece wav_data) {
|
| WavAudioParameters params;
|
| base::StringPiece audio_data;
|
|
|
| // Attempt to parse the WAV data.
|
| if (!ParseWavData(wav_data, &audio_data, ¶ms))
|
| - return scoped_ptr<WavAudioHandler>();
|
| + return nullptr;
|
|
|
| - return make_scoped_ptr(new WavAudioHandler(audio_data, params.num_channels,
|
| - params.sample_rate,
|
| - params.bits_per_sample));
|
| + return base::WrapUnique(new WavAudioHandler(audio_data, params.num_channels,
|
| + params.sample_rate,
|
| + params.bits_per_sample));
|
| }
|
|
|
| bool WavAudioHandler::AtEnd(size_t cursor) const {
|
|
|