| Index: media/blink/webcontentdecryptionmodule_impl.cc
|
| diff --git a/media/blink/webcontentdecryptionmodule_impl.cc b/media/blink/webcontentdecryptionmodule_impl.cc
|
| index 45c0407fe822a721daefa09305b5d511b3b7c965..b54ebe2e8c0da6808004f6fc20017285bc5e2dcc 100644
|
| --- a/media/blink/webcontentdecryptionmodule_impl.cc
|
| +++ b/media/blink/webcontentdecryptionmodule_impl.cc
|
| @@ -29,7 +29,7 @@ void WebContentDecryptionModuleImpl::Create(
|
| const base::string16& key_system,
|
| const blink::WebSecurityOrigin& security_origin,
|
| const CdmConfig& cdm_config,
|
| - scoped_ptr<blink::WebContentDecryptionModuleResult> result) {
|
| + std::unique_ptr<blink::WebContentDecryptionModuleResult> result) {
|
| DCHECK(!security_origin.isNull());
|
| DCHECK(!key_system.empty());
|
|
|
| @@ -97,7 +97,7 @@ void WebContentDecryptionModuleImpl::setServerCertificate(
|
| adapter_->SetServerCertificate(
|
| std::vector<uint8_t>(server_certificate,
|
| server_certificate + server_certificate_length),
|
| - scoped_ptr<SimpleCdmPromise>(
|
| + std::unique_ptr<SimpleCdmPromise>(
|
| new CdmResultPromise<>(result, std::string())));
|
| }
|
|
|
|
|