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

Unified Diff: media/cdm/aes_decryptor.cc

Issue 2095523002: Make //crypto factories return std::unique_ptr<>s (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: I'm blind Created 4 years, 6 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/cdm/aes_decryptor.cc
diff --git a/media/cdm/aes_decryptor.cc b/media/cdm/aes_decryptor.cc
index bb5baa48c93c48efa9a5f02b4e7717d3121676a9..af7182f1097ab3fdbaeebe8180c97bb95d690802 100644
--- a/media/cdm/aes_decryptor.cc
+++ b/media/cdm/aes_decryptor.cc
@@ -481,9 +481,8 @@ void AesDecryptor::Decrypt(StreamType stream_type,
return;
}
- crypto::SymmetricKey* decryption_key = key->decryption_key();
- decrypted = DecryptData(*encrypted.get(), decryption_key);
- if (!decrypted.get()) {
+ decrypted = DecryptData(*encrypted.get(), key->decryption_key());
+ if (!decrypted) {
DVLOG(1) << "Decryption failed.";
decrypt_cb.Run(kError, NULL);
return;
@@ -607,8 +606,8 @@ AesDecryptor::DecryptionKey::~DecryptionKey() {}
bool AesDecryptor::DecryptionKey::Init() {
CHECK(!secret_.empty());
- decryption_key_.reset(crypto::SymmetricKey::Import(
- crypto::SymmetricKey::AES, secret_));
+ decryption_key_ =
+ crypto::SymmetricKey::Import(crypto::SymmetricKey::AES, secret_);
if (!decryption_key_)
return false;
return true;
« no previous file with comments | « media/cast/common/transport_encryption_handler.cc ('k') | net/extras/sqlite/sqlite_channel_id_store_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698