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

Unified Diff: media/audio/null_audio_sink.h

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/mock_audio_manager.cc ('k') | media/audio/pulse/pulse_output.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
};
« no previous file with comments | « media/audio/mock_audio_manager.cc ('k') | media/audio/pulse/pulse_output.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698