| Index: media/cdm/ppapi/external_clear_key/cdm_video_decoder.h
|
| diff --git a/media/cdm/ppapi/external_clear_key/cdm_video_decoder.h b/media/cdm/ppapi/external_clear_key/cdm_video_decoder.h
|
| index 696a2903e40d98266d3055ca5dab2f9b14303d61..7ca88724aaca77686152fb7f34bf58a9011c36b7 100644
|
| --- a/media/cdm/ppapi/external_clear_key/cdm_video_decoder.h
|
| +++ b/media/cdm/ppapi/external_clear_key/cdm_video_decoder.h
|
| @@ -7,7 +7,8 @@
|
|
|
| #include <stdint.h>
|
|
|
| -#include "base/memory/scoped_ptr.h"
|
| +#include <memory>
|
| +
|
| #include "media/cdm/api/content_decryption_module.h"
|
| #include "media/cdm/ppapi/external_clear_key/clear_key_cdm_common.h"
|
|
|
| @@ -37,8 +38,9 @@ class CdmVideoDecoder {
|
| // Initializes appropriate video decoder based on GYP flags and the value of
|
| // |config.codec|. Returns a scoped_ptr containing a non-null initialized
|
| // CdmVideoDecoder* upon success.
|
| -scoped_ptr<CdmVideoDecoder> CreateVideoDecoder(
|
| - ClearKeyCdmHost* host, const cdm::VideoDecoderConfig& config);
|
| +std::unique_ptr<CdmVideoDecoder> CreateVideoDecoder(
|
| + ClearKeyCdmHost* host,
|
| + const cdm::VideoDecoderConfig& config);
|
|
|
| } // namespace media
|
|
|
|
|