media/cast/common/transport_encryption_handler.cc - Issue 2095523002: Make //crypto factories return std::unique_ptr<>s

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Fix comment 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:

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;