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); |
}; |