| Index: media/cdm/ppapi/external_clear_key/clear_key_cdm.cc
|
| diff --git a/media/cdm/ppapi/external_clear_key/clear_key_cdm.cc b/media/cdm/ppapi/external_clear_key/clear_key_cdm.cc
|
| index f6c77815303af428b5a131b4fa5e5915b4234691..61f082035fc8edb8155a73f6190ce2261a6c66db 100644
|
| --- a/media/cdm/ppapi/external_clear_key/clear_key_cdm.cc
|
| +++ b/media/cdm/ppapi/external_clear_key/clear_key_cdm.cc
|
| @@ -212,23 +212,15 @@ void ConvertCdmKeysInfo(const std::vector<media::CdmKeyInformation*>& keys_info,
|
| }
|
| }
|
|
|
| -template<typename Type>
|
| -class ScopedResetter {
|
| - public:
|
| - explicit ScopedResetter(Type* object) : object_(object) {}
|
| - ~ScopedResetter() { object_->Reset(); }
|
| -
|
| - private:
|
| - Type* const object_;
|
| -};
|
| -
|
| void INITIALIZE_CDM_MODULE() {
|
| + DVLOG(1) << __FUNCTION__;
|
| #if defined(CLEAR_KEY_CDM_USE_FFMPEG_DECODER)
|
| av_register_all();
|
| #endif // CLEAR_KEY_CDM_USE_FFMPEG_DECODER
|
| }
|
|
|
| void DeinitializeCdmModule() {
|
| + DVLOG(1) << __FUNCTION__;
|
| }
|
|
|
| void* CreateCdmInstance(int cdm_interface_version,
|
| @@ -255,7 +247,8 @@ void* CreateCdmInstance(int cdm_interface_version,
|
| return NULL;
|
|
|
| // TODO(jrummell): Obtain the proper origin for this instance.
|
| - return new media::ClearKeyCdm(host, key_system_string, GURL::EmptyGURL());
|
| + GURL empty_gurl;
|
| + return new media::ClearKeyCdm(host, key_system_string, empty_gurl);
|
| }
|
|
|
| const char* GetCdmVersion() {
|
|
|