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

Unified Diff: media/audio/sounds/audio_stream_handler.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: Fix cast + windows build 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
Index: media/audio/sounds/audio_stream_handler.cc
diff --git a/media/audio/sounds/audio_stream_handler.cc b/media/audio/sounds/audio_stream_handler.cc
index 56d1b94b28b18f322a487b19b48901dda409e28e..74f7d70fc47e0c0e1acbaa4a51264b3e1a4044bf 100644
--- a/media/audio/sounds/audio_stream_handler.cc
+++ b/media/audio/sounds/audio_stream_handler.cc
@@ -40,7 +40,7 @@ AudioOutputStream::AudioSourceCallback* g_audio_source_for_testing = NULL;
class AudioStreamHandler::AudioStreamContainer
: public AudioOutputStream::AudioSourceCallback {
public:
- explicit AudioStreamContainer(scoped_ptr<WavAudioHandler> wav_audio)
+ explicit AudioStreamContainer(std::unique_ptr<WavAudioHandler> wav_audio)
: started_(false),
stream_(NULL),
cursor_(0),
@@ -158,7 +158,7 @@ class AudioStreamHandler::AudioStreamContainer
base::Lock state_lock_;
size_t cursor_;
bool delayed_stop_posted_;
- scoped_ptr<WavAudioHandler> wav_audio_;
+ std::unique_ptr<WavAudioHandler> wav_audio_;
base::CancelableClosure stop_closure_;
DISALLOW_COPY_AND_ASSIGN(AudioStreamContainer);
@@ -171,7 +171,8 @@ AudioStreamHandler::AudioStreamHandler(const base::StringPiece& wav_data) {
return;
}
- scoped_ptr<WavAudioHandler> wav_audio = WavAudioHandler::Create(wav_data);
+ std::unique_ptr<WavAudioHandler> wav_audio =
danakj 2016/04/22 22:47:37 include memory
dcheng 2016/04/22 23:13:20 Done (but in related header instead)
+ WavAudioHandler::Create(wav_data);
if (!wav_audio) {
LOG(ERROR) << "wav_data is not valid";
return;

Powered by Google App Engine
This is Rietveld 408576698