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

Unified Diff: media/mojo/services/mojo_cdm.cc

Issue 1544313002: Convert Pass()→std::move() in //media (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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/mojo/services/mojo_cdm.h ('k') | media/mojo/services/mojo_cdm_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mojo/services/mojo_cdm.cc
diff --git a/media/mojo/services/mojo_cdm.cc b/media/mojo/services/mojo_cdm.cc
index 0ce88154ab1e918cba79583926c1452c74abf918..31dd4a7a0434f0c8a2bc43b0207839e09e8c8c5b 100644
--- a/media/mojo/services/mojo_cdm.cc
+++ b/media/mojo/services/mojo_cdm.cc
@@ -42,7 +42,7 @@ void MojoCdm::Create(
const media::SessionExpirationUpdateCB& session_expiration_update_cb,
const media::CdmCreatedCB& cdm_created_cb) {
scoped_refptr<MojoCdm> mojo_cdm(
- new MojoCdm(remote_cdm.Pass(), session_message_cb, session_closed_cb,
+ new MojoCdm(std::move(remote_cdm), session_message_cb, session_closed_cb,
legacy_session_error_cb, session_keys_change_cb,
session_expiration_update_cb));
@@ -51,7 +51,7 @@ void MojoCdm::Create(
new CdmInitializedPromise(cdm_created_cb, mojo_cdm));
mojo_cdm->InitializeCdm(key_system, security_origin, cdm_config,
- promise.Pass());
+ std::move(promise));
}
MojoCdm::MojoCdm(interfaces::ContentDecryptionModulePtr remote_cdm,
@@ -60,7 +60,7 @@ MojoCdm::MojoCdm(interfaces::ContentDecryptionModulePtr remote_cdm,
const LegacySessionErrorCB& legacy_session_error_cb,
const SessionKeysChangeCB& session_keys_change_cb,
const SessionExpirationUpdateCB& session_expiration_update_cb)
- : remote_cdm_(remote_cdm.Pass()),
+ : remote_cdm_(std::move(remote_cdm)),
binding_(this),
cdm_id_(CdmContext::kInvalidCdmId),
session_message_cb_(session_message_cb),
@@ -78,7 +78,7 @@ MojoCdm::MojoCdm(interfaces::ContentDecryptionModulePtr remote_cdm,
interfaces::ContentDecryptionModuleClientPtr client_ptr;
binding_.Bind(GetProxy(&client_ptr));
- remote_cdm_->SetClient(client_ptr.Pass());
+ remote_cdm_->SetClient(std::move(client_ptr));
}
MojoCdm::~MojoCdm() {
@@ -229,7 +229,7 @@ void MojoCdm::OnSessionKeysChange(
keys_info[i].To<scoped_ptr<media::CdmKeyInformation>>().release());
}
session_keys_change_cb_.Run(session_id, has_additional_usable_key,
- key_data.Pass());
+ std::move(key_data));
}
void MojoCdm::OnSessionExpirationUpdate(const mojo::String& session_id,
@@ -245,7 +245,7 @@ void MojoCdm::OnCdmInitialized(scoped_ptr<CdmInitializedPromise> promise,
interfaces::DecryptorPtr decryptor) {
DVLOG(2) << __FUNCTION__ << " cdm_id: " << cdm_id;
if (!result->success) {
- RejectPromise(promise.Pass(), result.Pass());
+ RejectPromise(std::move(promise), std::move(result));
return;
}
« no previous file with comments | « media/mojo/services/mojo_cdm.h ('k') | media/mojo/services/mojo_cdm_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698