Index: content/renderer/pepper/content_decryptor_delegate.cc |
diff --git a/content/renderer/pepper/content_decryptor_delegate.cc b/content/renderer/pepper/content_decryptor_delegate.cc |
index dca5b02b82162b29fcfe2cfc29a2fa35406e5878..621aaf1a074f7a3231ca30a97b712c2b48852c7f 100644 |
--- a/content/renderer/pepper/content_decryptor_delegate.cc |
+++ b/content/renderer/pepper/content_decryptor_delegate.cc |
@@ -389,7 +389,7 @@ void ContentDecryptorDelegate::Initialize( |
const media::SessionKeysChangeCB& session_keys_change_cb, |
const media::SessionExpirationUpdateCB& session_expiration_update_cb, |
const base::Closure& fatal_plugin_error_cb, |
- scoped_ptr<media::SimpleCdmPromise> promise) { |
+ std::unique_ptr<media::SimpleCdmPromise> promise) { |
DCHECK(!key_system.empty()); |
DCHECK(key_system_.empty()); |
key_system_ = key_system; |
@@ -415,7 +415,7 @@ void ContentDecryptorDelegate::InstanceCrashed() { |
void ContentDecryptorDelegate::SetServerCertificate( |
const std::vector<uint8_t>& certificate, |
- scoped_ptr<media::SimpleCdmPromise> promise) { |
+ std::unique_ptr<media::SimpleCdmPromise> promise) { |
if (certificate.size() < media::limits::kMinCertificateLength || |
certificate.size() > media::limits::kMaxCertificateLength) { |
promise->reject( |
@@ -435,7 +435,7 @@ void ContentDecryptorDelegate::CreateSessionAndGenerateRequest( |
MediaKeys::SessionType session_type, |
media::EmeInitDataType init_data_type, |
const std::vector<uint8_t>& init_data, |
- scoped_ptr<NewSessionCdmPromise> promise) { |
+ std::unique_ptr<NewSessionCdmPromise> promise) { |
uint32_t promise_id = cdm_promise_adapter_.SavePromise(std::move(promise)); |
PP_Var init_data_array = |
PpapiGlobals::Get()->GetVarTracker()->MakeArrayBufferPPVar( |
@@ -448,7 +448,7 @@ void ContentDecryptorDelegate::CreateSessionAndGenerateRequest( |
void ContentDecryptorDelegate::LoadSession( |
media::MediaKeys::SessionType session_type, |
const std::string& session_id, |
- scoped_ptr<NewSessionCdmPromise> promise) { |
+ std::unique_ptr<NewSessionCdmPromise> promise) { |
uint32_t promise_id = cdm_promise_adapter_.SavePromise(std::move(promise)); |
plugin_decryption_interface_->LoadSession( |
pp_instance_, promise_id, MediaSessionTypeToPpSessionType(session_type), |
@@ -458,7 +458,7 @@ void ContentDecryptorDelegate::LoadSession( |
void ContentDecryptorDelegate::UpdateSession( |
const std::string& session_id, |
const std::vector<uint8_t>& response, |
- scoped_ptr<SimpleCdmPromise> promise) { |
+ std::unique_ptr<SimpleCdmPromise> promise) { |
uint32_t promise_id = cdm_promise_adapter_.SavePromise(std::move(promise)); |
PP_Var response_array = |
PpapiGlobals::Get()->GetVarTracker()->MakeArrayBufferPPVar( |
@@ -470,7 +470,7 @@ void ContentDecryptorDelegate::UpdateSession( |
void ContentDecryptorDelegate::CloseSession( |
const std::string& session_id, |
- scoped_ptr<SimpleCdmPromise> promise) { |
+ std::unique_ptr<SimpleCdmPromise> promise) { |
if (session_id.length() > media::limits::kMaxSessionIdLength) { |
promise->reject( |
media::MediaKeys::INVALID_ACCESS_ERROR, 0, "Incorrect session."); |
@@ -484,7 +484,7 @@ void ContentDecryptorDelegate::CloseSession( |
void ContentDecryptorDelegate::RemoveSession( |
const std::string& session_id, |
- scoped_ptr<SimpleCdmPromise> promise) { |
+ std::unique_ptr<SimpleCdmPromise> promise) { |
if (session_id.length() > media::limits::kMaxSessionIdLength) { |
promise->reject( |
media::MediaKeys::INVALID_ACCESS_ERROR, 0, "Incorrect session."); |