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

Unified Diff: media/filters/android/media_codec_audio_decoder.h

Issue 1904213003: Convert //media/filters from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove include 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 | « no previous file | media/filters/android/media_codec_audio_decoder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/android/media_codec_audio_decoder.h
diff --git a/media/filters/android/media_codec_audio_decoder.h b/media/filters/android/media_codec_audio_decoder.h
index 3e68ba4e2d0e148401c73bdf07af103f904bbad3..642ea32a3c901161b09b692026612f4d448632e7 100644
--- a/media/filters/android/media_codec_audio_decoder.h
+++ b/media/filters/android/media_codec_audio_decoder.h
@@ -6,10 +6,10 @@
#define MEDIA_FILTERS_ANDROID_MEDIA_CODEC_AUDIO_DECODER_H_
#include <deque>
+#include <memory>
#include <utility>
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/time/time.h"
#include "base/timer/timer.h"
@@ -240,9 +240,9 @@ class MEDIA_EXPORT MediaCodecAudioDecoder : public AudioDecoder {
// Callback that delivers output frames.
OutputCB output_cb_;
- scoped_ptr<MediaCodecBridge> media_codec_;
+ std::unique_ptr<MediaCodecBridge> media_codec_;
- scoped_ptr<AudioTimestampHelper> timestamp_helper_;
+ std::unique_ptr<AudioTimestampHelper> timestamp_helper_;
// Repeating timer that kicks MediaCodec operation.
base::RepeatingTimer io_timer_;
« no previous file with comments | « no previous file | media/filters/android/media_codec_audio_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698