chrome/browser/chromeos/settings/token_encryptor.h - 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: chrome/browser/chromeos/settings/token_encryptor.h

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:

Index: chrome/browser/chromeos/settings/token_encryptor.h

diff --git a/chrome/browser/chromeos/settings/token_encryptor.h b/chrome/browser/chromeos/settings/token_encryptor.h

index 0ef1008bd56c81b54b2ee3d5711238d0a2cebe4a..d4d5e392bd62e93db7fcabb9de8100a622751633 100644

--- a/chrome/browser/chromeos/settings/token_encryptor.h

+++ b/chrome/browser/chromeos/settings/token_encryptor.h

@@ -47,8 +47,9 @@ class CryptohomeTokenEncryptor : public TokenEncryptor {

private:

// Converts |passphrase| to a SymmetricKey using the given |salt|.

- crypto::SymmetricKey* PassphraseToKey(const std::string& passphrase,

- const std::string& salt);

+ std::unique_ptr<crypto::SymmetricKey> PassphraseToKey(

+ const std::string& passphrase,

+ const std::string& salt);

// Encrypts (AES) the token given |key| and |salt|.

std::string EncryptTokenWithKey(crypto::SymmetricKey* key,