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

Unified Diff: media/cdm/cdm_allocator.h

Issue 1915443003: Replace scoped_ptr with std::unique_ptr in //media. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptr-media-base
Patch Set: scopedptr-media: rebase 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/cdm/cdm_adapter_unittest.cc ('k') | media/cdm/cenc_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cdm/cdm_allocator.h
diff --git a/media/cdm/cdm_allocator.h b/media/cdm/cdm_allocator.h
index 84e7f3057e24a1b41bc7d5bb0743352b26403370..b06baac14ca2e7edd4be2671b03debcfa9c18b05 100644
--- a/media/cdm/cdm_allocator.h
+++ b/media/cdm/cdm_allocator.h
@@ -8,8 +8,9 @@
#include <stddef.h>
#include <stdint.h>
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "media/base/media_export.h"
namespace cdm {
@@ -29,7 +30,7 @@ class MEDIA_EXPORT CdmAllocator {
virtual cdm::Buffer* CreateCdmBuffer(size_t capacity) = 0;
// Returns a new VideoFrameImpl.
- virtual scoped_ptr<VideoFrameImpl> CreateCdmVideoFrame() = 0;
+ virtual std::unique_ptr<VideoFrameImpl> CreateCdmVideoFrame() = 0;
protected:
CdmAllocator();
« no previous file with comments | « media/cdm/cdm_adapter_unittest.cc ('k') | media/cdm/cenc_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698