| Index: media/cdm/ppapi/external_clear_key/clear_key_cdm.h
|
| diff --git a/media/cdm/ppapi/external_clear_key/clear_key_cdm.h b/media/cdm/ppapi/external_clear_key/clear_key_cdm.h
|
| index 706f4a033cfd4eb2c0b0f2dc89e7afa0bb9931a5..559e4db27b7538387fc45e75bfe59ef85b81e967 100644
|
| --- a/media/cdm/ppapi/external_clear_key/clear_key_cdm.h
|
| +++ b/media/cdm/ppapi/external_clear_key/clear_key_cdm.h
|
| @@ -7,13 +7,13 @@
|
|
|
| #include <stdint.h>
|
|
|
| +#include <memory>
|
| #include <string>
|
| #include <vector>
|
|
|
| #include "base/compiler_specific.h"
|
| #include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/synchronization/lock.h"
|
| #include "media/base/cdm_key_information.h"
|
| #include "media/cdm/aes_decryptor.h"
|
| @@ -202,12 +202,12 @@ class ClearKeyCdm : public ClearKeyCdmInterface {
|
| #endif // CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER
|
|
|
| #if defined(CLEAR_KEY_CDM_USE_FFMPEG_DECODER)
|
| - scoped_ptr<FFmpegCdmAudioDecoder> audio_decoder_;
|
| + std::unique_ptr<FFmpegCdmAudioDecoder> audio_decoder_;
|
| #endif // CLEAR_KEY_CDM_USE_FFMPEG_DECODER
|
|
|
| - scoped_ptr<CdmVideoDecoder> video_decoder_;
|
| + std::unique_ptr<CdmVideoDecoder> video_decoder_;
|
|
|
| - scoped_ptr<FileIOTestRunner> file_io_test_runner_;
|
| + std::unique_ptr<FileIOTestRunner> file_io_test_runner_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ClearKeyCdm);
|
| };
|
|
|