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

Unified Diff: media/base/audio_renderer_mixer.h

Issue 1906423005: Replace scoped_ptr with std::unique_ptr in //media/base. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptr-media-base: android 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/base/audio_push_fifo_unittest.cc ('k') | media/base/audio_renderer_mixer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/audio_renderer_mixer.h
diff --git a/media/base/audio_renderer_mixer.h b/media/base/audio_renderer_mixer.h
index 9c712105d98a9eef490f3e650a83643e77942802..7a6c1dd781bb96572e51dd71bbe96247d6ae6566 100644
--- a/media/base/audio_renderer_mixer.h
+++ b/media/base/audio_renderer_mixer.h
@@ -8,10 +8,10 @@
#include <stdint.h>
#include <map>
+#include <memory>
#include <string>
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/synchronization/lock.h"
#include "base/time/time.h"
#include "media/base/audio_converter.h"
@@ -50,7 +50,8 @@ class MEDIA_EXPORT AudioRendererMixer
private:
// Maps input sample rate to the dedicated converter.
- typedef std::map<int, scoped_ptr<LoopbackAudioConverter>> AudioConvertersMap;
+ using AudioConvertersMap =
+ std::map<int, std::unique_ptr<LoopbackAudioConverter>>;
// AudioRendererSink::RenderCallback implementation.
int Render(AudioBus* audio_bus,
« no previous file with comments | « media/base/audio_push_fifo_unittest.cc ('k') | media/base/audio_renderer_mixer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698