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

Unified Diff: media/base/android/ndk_media_codec_bridge.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: . 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/base/android/ndk_media_codec_bridge.h
diff --git a/media/base/android/ndk_media_codec_bridge.h b/media/base/android/ndk_media_codec_bridge.h
index d7f2b108a1a5458d798fc50239fce1c99ac4bf58..3f75a73e0205f8e773cd123f68a192304b654e72 100644
--- a/media/base/android/ndk_media_codec_bridge.h
+++ b/media/base/android/ndk_media_codec_bridge.h
@@ -9,8 +9,9 @@
#include <stddef.h>
#include <stdint.h>
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/time/time.h"
#include "media/base/android/media_codec_bridge.h"
#include "media/base/media_export.h"
@@ -72,7 +73,7 @@ class MEDIA_EXPORT NdkMediaCodecBridge : public MediaCodecBridge {
inline void operator()(AMediaCodec* ptr) const { AMediaCodec_delete(ptr); }
};
- scoped_ptr<AMediaCodec, AMediaCodecDeleter> media_codec_;
+ std::unique_ptr<AMediaCodec, AMediaCodecDeleter> media_codec_;
DISALLOW_COPY_AND_ASSIGN(NdkMediaCodecBridge);
};

Powered by Google App Engine
This is Rietveld 408576698