Index: media/cdm/ppapi/cdm_adapter.cc |
diff --git a/media/cdm/ppapi/cdm_adapter.cc b/media/cdm/ppapi/cdm_adapter.cc |
index fb8e5f433eaf8ba4a5f827aa48d7a408f800439d..7fcd5f02b21760683c3bf0cca2edb20221ec7721 100644 |
--- a/media/cdm/ppapi/cdm_adapter.cc |
+++ b/media/cdm/ppapi/cdm_adapter.cc |
@@ -212,18 +212,12 @@ CdmAdapter::CdmAdapter(PP_Instance instance, pp::Module* module) |
callback_factory_.Initialize(this); |
} |
-CdmAdapter::~CdmAdapter() { |
- if (cdm_) |
- cdm_->Destroy(); |
-} |
+CdmAdapter::~CdmAdapter() {} |
bool CdmAdapter::CreateCdmInstance(const std::string& key_system) { |
PP_DCHECK(!cdm_); |
- cdm_ = static_cast<cdm::ContentDecryptionModule*>( |
- ::CreateCdmInstance(cdm::kCdmInterfaceVersion, |
- key_system.data(), key_system.size(), |
- GetCdmHost, this)); |
- |
+ cdm_ = make_linked_ptr(CdmWrapper::Create( |
+ key_system.data(), key_system.size(), GetCdmHost, this)); |
return (cdm_ != NULL); |
} |