Index: media/audio/null_audio_sink.h |
diff --git a/media/audio/null_audio_sink.h b/media/audio/null_audio_sink.h |
index eebdb144e84ef77213aa69e33d5ef3dba09a2b5d..6d24fbe39c6c81ccf2a3e835a8d38c092e9c4f28 100644 |
--- a/media/audio/null_audio_sink.h |
+++ b/media/audio/null_audio_sink.h |
@@ -5,10 +5,10 @@ |
#ifndef MEDIA_AUDIO_NULL_AUDIO_SINK_H_ |
#define MEDIA_AUDIO_NULL_AUDIO_SINK_H_ |
+#include <memory> |
#include <string> |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "media/base/audio_renderer_sink.h" |
namespace base { |
@@ -57,11 +57,11 @@ class MEDIA_EXPORT NullAudioSink |
RenderCallback* callback_; |
// Controls whether or not a running hash is computed for audio frames. |
- scoped_ptr<AudioHash> audio_hash_; |
+ std::unique_ptr<AudioHash> audio_hash_; |
scoped_refptr<base::SingleThreadTaskRunner> task_runner_; |
- scoped_ptr<FakeAudioWorker> fake_worker_; |
- scoped_ptr<AudioBus> audio_bus_; |
+ std::unique_ptr<FakeAudioWorker> fake_worker_; |
+ std::unique_ptr<AudioBus> audio_bus_; |
DISALLOW_COPY_AND_ASSIGN(NullAudioSink); |
}; |