Convert Pass()→std::move() in //media

media/mojo/services/mojo_cdm_service.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/mojo/services/mojo_cdm_service.h"
 
 #include <map>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 64 matching lines @@
 scoped_refptr<MediaKeys> MojoCdmService::GetCdm(int cdm_id) {
   DVLOG(1) << __FUNCTION__ << ": " << cdm_id;
   return g_cdm_manager.Get().GetCdm(cdm_id);
 }
 
 MojoCdmService::MojoCdmService(
     base::WeakPtr<MojoCdmServiceContext> context,
     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),
       cdm_id_(CdmContext::kInvalidCdmId),
       weak_factory_(this) {
   DCHECK(context_);
   DCHECK(cdm_factory_);
 }
 
 MojoCdmService::~MojoCdmService() {
   g_cdm_manager.Get().UnregisterCdm(cdm_id_);
 
   if (cdm_id_ != CdmContext::kInvalidCdmId && context_)
     context_->UnregisterCdm(cdm_id_);
 }
 
 void MojoCdmService::SetClient(
     interfaces::ContentDecryptionModuleClientPtr client) {
-  client_ = client.Pass();
+  client_ = std::move(client);
 }
 
 void MojoCdmService::Initialize(const mojo::String& key_system,
                                 const mojo::String& security_origin,
                                 interfaces::CdmConfigPtr cdm_config,
                                 const InitializeCallback& callback) {
   DVLOG(1) << __FUNCTION__ << ": " << key_system;
   DCHECK(!cdm_);
 
   auto weak_this = weak_factory_.GetWeakPtr();
@@ skipping 125 matching lines @@
 
 void MojoCdmService::OnSessionKeysChange(const std::string& session_id,
                                          bool has_additional_usable_key,
                                          CdmKeysInfo keys_info) {
   DVLOG(2) << __FUNCTION__;
 
   mojo::Array<interfaces::CdmKeyInformationPtr> keys_data;
   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(
     const std::string& session_id,
     const base::Time& new_expiry_time_sec) {
   DVLOG(2) << __FUNCTION__;
   client_->OnSessionExpirationUpdate(session_id,
                                      new_expiry_time_sec.ToDoubleT());
 }
 
@@ skipping 14 matching lines @@
 
 void MojoCdmService::OnDecryptorConnectionError() {
   DVLOG(2) << __FUNCTION__;
 
   // MojoDecryptorService has lost connectivity to it's client, so it can be
   // freed.
   decryptor_.reset();
 }
 
 }  // namespace media