Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(506)

Unified Diff: media/blink/cdm_session_adapter.cc

Issue 1904253002: Convert //media/blink from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/blink/cdm_session_adapter.h ('k') | media/blink/key_system_config_selector.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/blink/cdm_session_adapter.cc
diff --git a/media/blink/cdm_session_adapter.cc b/media/blink/cdm_session_adapter.cc
index 3e1cd6095b6a195c51dc421a35725c7e7fcecc40..312053e35557474eb30d36836f2885b63b456e38 100644
--- a/media/blink/cdm_session_adapter.cc
+++ b/media/blink/cdm_session_adapter.cc
@@ -52,7 +52,7 @@ void CdmSessionAdapter::CreateCdm(
const std::string& key_system,
const GURL& security_origin,
const CdmConfig& cdm_config,
- scoped_ptr<blink::WebContentDecryptionModuleResult> result) {
+ std::unique_ptr<blink::WebContentDecryptionModuleResult> result) {
TRACE_EVENT_ASYNC_BEGIN0("media", "CdmSessionAdapter::CreateCdm",
++trace_id_);
@@ -79,7 +79,7 @@ void CdmSessionAdapter::CreateCdm(
void CdmSessionAdapter::SetServerCertificate(
const std::vector<uint8_t>& certificate,
- scoped_ptr<SimpleCdmPromise> promise) {
+ std::unique_ptr<SimpleCdmPromise> promise) {
cdm_->SetServerCertificate(certificate, std::move(promise));
}
@@ -107,30 +107,34 @@ void CdmSessionAdapter::InitializeNewSession(
EmeInitDataType init_data_type,
const std::vector<uint8_t>& init_data,
MediaKeys::SessionType session_type,
- scoped_ptr<NewSessionCdmPromise> promise) {
+ std::unique_ptr<NewSessionCdmPromise> promise) {
cdm_->CreateSessionAndGenerateRequest(session_type, init_data_type, init_data,
std::move(promise));
}
-void CdmSessionAdapter::LoadSession(MediaKeys::SessionType session_type,
- const std::string& session_id,
- scoped_ptr<NewSessionCdmPromise> promise) {
+void CdmSessionAdapter::LoadSession(
+ MediaKeys::SessionType session_type,
+ const std::string& session_id,
+ std::unique_ptr<NewSessionCdmPromise> promise) {
cdm_->LoadSession(session_type, session_id, std::move(promise));
}
-void CdmSessionAdapter::UpdateSession(const std::string& session_id,
- const std::vector<uint8_t>& response,
- scoped_ptr<SimpleCdmPromise> promise) {
+void CdmSessionAdapter::UpdateSession(
+ const std::string& session_id,
+ const std::vector<uint8_t>& response,
+ std::unique_ptr<SimpleCdmPromise> promise) {
cdm_->UpdateSession(session_id, response, std::move(promise));
}
-void CdmSessionAdapter::CloseSession(const std::string& session_id,
- scoped_ptr<SimpleCdmPromise> promise) {
+void CdmSessionAdapter::CloseSession(
+ const std::string& session_id,
+ std::unique_ptr<SimpleCdmPromise> promise) {
cdm_->CloseSession(session_id, std::move(promise));
}
-void CdmSessionAdapter::RemoveSession(const std::string& session_id,
- scoped_ptr<SimpleCdmPromise> promise) {
+void CdmSessionAdapter::RemoveSession(
+ const std::string& session_id,
+ std::unique_ptr<SimpleCdmPromise> promise) {
cdm_->RemoveSession(session_id, std::move(promise));
}
« no previous file with comments | « media/blink/cdm_session_adapter.h ('k') | media/blink/key_system_config_selector.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698