Chromium Code Reviews| 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..8bf0001390a28fa0a5c5a203c461ef0149d2f255 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 std::unique_ptr<WavAudioHandler>(); |
|
danakj
2016/04/22 22:47:37
include memory, or nullptr
dcheng
2016/04/22 23:13:20
Done.
|
| - 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 { |