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

Unified Diff: media/base/android/media_drm_bridge.cc

Issue 1906423005: Replace scoped_ptr with std::unique_ptr in //media/base. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptr-media-base: . 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
Index: media/base/android/media_drm_bridge.cc
diff --git a/media/base/android/media_drm_bridge.cc b/media/base/android/media_drm_bridge.cc
index 96821aec43c07a7fd3e78e847c77d1d3ad7c9377..a9af2996b6d65dcac6123628dba7cb192b5194f3 100644
--- a/media/base/android/media_drm_bridge.cc
+++ b/media/base/android/media_drm_bridge.cc
@@ -345,7 +345,7 @@ scoped_refptr<MediaDrmBridge> MediaDrmBridge::CreateWithoutSessionSupport(
void MediaDrmBridge::SetServerCertificate(
const std::vector<uint8_t>& certificate,
- scoped_ptr<media::SimpleCdmPromise> promise) {
+ std::unique_ptr<media::SimpleCdmPromise> promise) {
DCHECK(task_runner_->BelongsToCurrentThread());
DVLOG(2) << __FUNCTION__ << "(" << certificate.size() << " bytes)";
@@ -366,7 +366,7 @@ void MediaDrmBridge::CreateSessionAndGenerateRequest(
SessionType session_type,
media::EmeInitDataType init_data_type,
const std::vector<uint8_t>& init_data,
- scoped_ptr<media::NewSessionCdmPromise> promise) {
+ std::unique_ptr<media::NewSessionCdmPromise> promise) {
DCHECK(task_runner_->BelongsToCurrentThread());
DVLOG(2) << __FUNCTION__;
@@ -422,7 +422,7 @@ void MediaDrmBridge::CreateSessionAndGenerateRequest(
void MediaDrmBridge::LoadSession(
SessionType session_type,
const std::string& session_id,
- scoped_ptr<media::NewSessionCdmPromise> promise) {
+ std::unique_ptr<media::NewSessionCdmPromise> promise) {
DCHECK(task_runner_->BelongsToCurrentThread());
DVLOG(2) << __FUNCTION__;
@@ -433,7 +433,7 @@ void MediaDrmBridge::LoadSession(
void MediaDrmBridge::UpdateSession(
const std::string& session_id,
const std::vector<uint8_t>& response,
- scoped_ptr<media::SimpleCdmPromise> promise) {
+ std::unique_ptr<media::SimpleCdmPromise> promise) {
DCHECK(task_runner_->BelongsToCurrentThread());
DVLOG(2) << __FUNCTION__;
@@ -448,8 +448,9 @@ void MediaDrmBridge::UpdateSession(
j_response.obj(), promise_id);
}
-void MediaDrmBridge::CloseSession(const std::string& session_id,
- scoped_ptr<media::SimpleCdmPromise> promise) {
+void MediaDrmBridge::CloseSession(
+ const std::string& session_id,
+ std::unique_ptr<media::SimpleCdmPromise> promise) {
DCHECK(task_runner_->BelongsToCurrentThread());
DVLOG(2) << __FUNCTION__;
@@ -464,7 +465,7 @@ void MediaDrmBridge::CloseSession(const std::string& session_id,
void MediaDrmBridge::RemoveSession(
const std::string& session_id,
- scoped_ptr<media::SimpleCdmPromise> promise) {
+ std::unique_ptr<media::SimpleCdmPromise> promise) {
DCHECK(task_runner_->BelongsToCurrentThread());
DVLOG(2) << __FUNCTION__;

Powered by Google App Engine
This is Rietveld 408576698