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

Unified Diff: media/mojo/services/mojo_cdm_service.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_promise.cc ('k') | media/mojo/services/mojo_decryptor_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mojo/services/mojo_cdm_service.cc
diff --git a/media/mojo/services/mojo_cdm_service.cc b/media/mojo/services/mojo_cdm_service.cc
index 95a07d0ad80633297beffbed91fe38e41b852e82..991d016dc323d5026c7b6dfd5c9b8323b535656a 100644
--- a/media/mojo/services/mojo_cdm_service.cc
+++ b/media/mojo/services/mojo_cdm_service.cc
@@ -82,7 +82,7 @@ MojoCdmService::MojoCdmService(
mojo::ServiceProvider* service_provider,
CdmFactory* cdm_factory,
mojo::InterfaceRequest<interfaces::ContentDecryptionModule> request)
- : binding_(this, request.Pass()),
+ : binding_(this, std::move(request)),
context_(context),
service_provider_(service_provider),
cdm_factory_(cdm_factory),
@@ -101,7 +101,7 @@ MojoCdmService::~MojoCdmService() {
void MojoCdmService::SetClient(
interfaces::ContentDecryptionModuleClientPtr client) {
- client_ = client.Pass();
+ client_ = std::move(client);
}
void MojoCdmService::Initialize(const mojo::String& key_system,
@@ -247,7 +247,7 @@ void MojoCdmService::OnSessionKeysChange(const std::string& session_id,
for (const auto& key : keys_info)
keys_data.push_back(interfaces::CdmKeyInformation::From(*key));
client_->OnSessionKeysChange(session_id, has_additional_usable_key,
- keys_data.Pass());
+ std::move(keys_data));
}
void MojoCdmService::OnSessionExpirationUpdate(
« no previous file with comments | « media/mojo/services/mojo_cdm_promise.cc ('k') | media/mojo/services/mojo_decryptor_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698