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

Unified Diff: media/cast/common/transport_encryption_handler.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
« no previous file with comments | « extensions/browser/content_verify_job.cc ('k') | media/cdm/aes_decryptor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/common/transport_encryption_handler.cc
diff --git a/media/cast/common/transport_encryption_handler.cc b/media/cast/common/transport_encryption_handler.cc
index 41d2b357653dc753af862deeb830cf8032c25a59..bcf2cf5c3331a82b6158df792bcc20936527ea7f 100644
--- a/media/cast/common/transport_encryption_handler.cc
+++ b/media/cast/common/transport_encryption_handler.cc
@@ -51,8 +51,7 @@ bool TransportEncryptionHandler::Initialize(const std::string& aes_key,
is_activated_ = false;
if (aes_iv_mask.size() == kAesKeySize && aes_key.size() == kAesKeySize) {
iv_mask_ = aes_iv_mask;
- key_.reset(
- crypto::SymmetricKey::Import(crypto::SymmetricKey::AES, aes_key));
+ key_ = crypto::SymmetricKey::Import(crypto::SymmetricKey::AES, aes_key);
encryptor_.reset(new crypto::Encryptor());
encryptor_->Init(key_.get(), crypto::Encryptor::CTR, std::string());
is_activated_ = true;
« no previous file with comments | « extensions/browser/content_verify_job.cc ('k') | media/cdm/aes_decryptor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698