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

Unified Diff: media/cdm/ppapi/external_clear_key/clear_key_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/cdm/ppapi/external_clear_key/cdm_video_decoder.cc ('k') | media/cdm/proxy_decryptor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cdm/ppapi/external_clear_key/clear_key_cdm.cc
diff --git a/media/cdm/ppapi/external_clear_key/clear_key_cdm.cc b/media/cdm/ppapi/external_clear_key/clear_key_cdm.cc
index 917c5acb8c4a41f0b6a1cf4e4c6e2e169e521aee..a164057444b9e608ebbcbad361ef92fd01cb4855 100644
--- a/media/cdm/ppapi/external_clear_key/clear_key_cdm.cc
+++ b/media/cdm/ppapi/external_clear_key/clear_key_cdm.cc
@@ -7,6 +7,7 @@
#include <algorithm>
#include <cstring>
#include <sstream>
+#include <utility>
#include "base/bind.h"
#include "base/logging.h"
@@ -112,7 +113,7 @@ static scoped_refptr<media::DecoderBuffer> CopyDecoderBufferFrom(
input_buffer.iv_size),
subsamples));
- output_buffer->set_decrypt_config(decrypt_config.Pass());
+ output_buffer->set_decrypt_config(std::move(decrypt_config));
output_buffer->set_timestamp(
base::TimeDelta::FromMicroseconds(input_buffer.timestamp));
@@ -306,7 +307,7 @@ void ClearKeyCdm::CreateSessionAndGenerateRequest(
decryptor_->CreateSessionAndGenerateRequest(
ConvertSessionType(session_type), ConvertInitDataType(init_data_type),
std::vector<uint8_t>(init_data, init_data + init_data_size),
- promise.Pass());
+ std::move(promise));
if (key_system_ == kExternalClearKeyFileIOTestKeySystem)
StartFileIOTest();
@@ -341,7 +342,7 @@ void ClearKeyCdm::LoadSession(uint32_t promise_id,
promise_id)));
decryptor_->CreateSessionAndGenerateRequest(
MediaKeys::TEMPORARY_SESSION, EmeInitDataType::WEBM,
- std::vector<uint8_t>(), promise.Pass());
+ std::vector<uint8_t>(), std::move(promise));
}
void ClearKeyCdm::UpdateSession(uint32_t promise_id,
@@ -363,7 +364,7 @@ void ClearKeyCdm::UpdateSession(uint32_t promise_id,
promise_id)));
decryptor_->UpdateSession(
web_session_str, std::vector<uint8_t>(response, response + response_size),
- promise.Pass());
+ std::move(promise));
if (!renewal_timer_set_) {
ScheduleNextRenewal();
@@ -386,7 +387,7 @@ void ClearKeyCdm::CloseSession(uint32_t promise_id,
&ClearKeyCdm::OnPromiseResolved, base::Unretained(this), promise_id),
base::Bind(
&ClearKeyCdm::OnPromiseFailed, base::Unretained(this), promise_id)));
- decryptor_->CloseSession(web_session_str, promise.Pass());
+ decryptor_->CloseSession(web_session_str, std::move(promise));
}
void ClearKeyCdm::RemoveSession(uint32_t promise_id,
@@ -415,7 +416,7 @@ void ClearKeyCdm::RemoveSession(uint32_t promise_id,
promise_id),
base::Bind(&ClearKeyCdm::OnPromiseFailed, base::Unretained(this),
promise_id)));
- decryptor_->RemoveSession(web_session_str, promise.Pass());
+ decryptor_->RemoveSession(web_session_str, std::move(promise));
}
void ClearKeyCdm::SetServerCertificate(uint32_t promise_id,
@@ -700,7 +701,7 @@ void ClearKeyCdm::LoadLoadableSession() {
promise_id_for_emulated_loadsession_)));
decryptor_->UpdateSession(
session_id_for_emulated_loadsession_,
- std::vector<uint8_t>(jwk_set.begin(), jwk_set.end()), promise.Pass());
+ std::vector<uint8_t>(jwk_set.begin(), jwk_set.end()), std::move(promise));
}
void ClearKeyCdm::OnSessionMessage(const std::string& session_id,
« no previous file with comments | « media/cdm/ppapi/external_clear_key/cdm_video_decoder.cc ('k') | media/cdm/proxy_decryptor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698