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