Index: media/blink/webcontentdecryptionmodulesession_impl.cc |
diff --git a/media/blink/webcontentdecryptionmodulesession_impl.cc b/media/blink/webcontentdecryptionmodulesession_impl.cc |
index 150886f58a4371e882b6481a5d8a62884bcd191f..8db343d31295a0dc4a0da8e35cd001b4294173cb 100644 |
--- a/media/blink/webcontentdecryptionmodulesession_impl.cc |
+++ b/media/blink/webcontentdecryptionmodulesession_impl.cc |
@@ -300,7 +300,7 @@ void WebContentDecryptionModuleSessionImpl::initializeNewSession( |
// 9.7 Use the cdm to execute the following steps: |
adapter_->InitializeNewSession( |
eme_init_data_type, sanitized_init_data, convertSessionType(session_type), |
- scoped_ptr<NewSessionCdmPromise>(new NewSessionCdmResultPromise( |
+ std::unique_ptr<NewSessionCdmPromise>(new NewSessionCdmResultPromise( |
result, adapter_->GetKeySystemUMAPrefix() + kGenerateRequestUMAName, |
base::Bind( |
&WebContentDecryptionModuleSessionImpl::OnSessionInitialized, |
@@ -327,7 +327,7 @@ void WebContentDecryptionModuleSessionImpl::load( |
// constructor (and removed from initializeNewSession()). |
adapter_->LoadSession( |
MediaKeys::PERSISTENT_LICENSE_SESSION, sanitized_session_id, |
- scoped_ptr<NewSessionCdmPromise>(new NewSessionCdmResultPromise( |
+ std::unique_ptr<NewSessionCdmPromise>(new NewSessionCdmResultPromise( |
result, adapter_->GetKeySystemUMAPrefix() + kLoadSessionUMAName, |
base::Bind( |
&WebContentDecryptionModuleSessionImpl::OnSessionInitialized, |
@@ -353,7 +353,7 @@ void WebContentDecryptionModuleSessionImpl::update( |
adapter_->UpdateSession( |
session_id_, sanitized_response, |
- scoped_ptr<SimpleCdmPromise>(new CdmResultPromise<>( |
+ std::unique_ptr<SimpleCdmPromise>(new CdmResultPromise<>( |
result, adapter_->GetKeySystemUMAPrefix() + kUpdateSessionUMAName))); |
} |
@@ -363,7 +363,7 @@ void WebContentDecryptionModuleSessionImpl::close( |
DCHECK(thread_checker_.CalledOnValidThread()); |
adapter_->CloseSession( |
session_id_, |
- scoped_ptr<SimpleCdmPromise>(new CdmResultPromise<>( |
+ std::unique_ptr<SimpleCdmPromise>(new CdmResultPromise<>( |
result, adapter_->GetKeySystemUMAPrefix() + kCloseSessionUMAName))); |
} |
@@ -373,7 +373,7 @@ void WebContentDecryptionModuleSessionImpl::remove( |
DCHECK(thread_checker_.CalledOnValidThread()); |
adapter_->RemoveSession( |
session_id_, |
- scoped_ptr<SimpleCdmPromise>(new CdmResultPromise<>( |
+ std::unique_ptr<SimpleCdmPromise>(new CdmResultPromise<>( |
result, adapter_->GetKeySystemUMAPrefix() + kRemoveSessionUMAName))); |
} |