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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: sync/util/nigori.cc

Issue 1866243002: Convert //sync from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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
« sync/util/cryptographer_unittest.cc ('K') | « sync/util/nigori.h ('k') | sync/util/nigori_unittest.cc » ('j') | sync/util/nigori_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/util/nigori.cc
diff --git a/sync/util/nigori.cc b/sync/util/nigori.cc
index 002f71802546d40ca459e7ef8d627afe616be621..2bd5b702dfbc5043163326568bf5c68468c2f8f6 100644
--- a/sync/util/nigori.cc
+++ b/sync/util/nigori.cc
@@ -74,10 +74,8 @@ bool Nigori::InitByDerivation(const std::string& hostname,
salt_password << username << hostname;
// Suser = PBKDF2(Username || Servername, "saltsalt", Nsalt, 8)
- scoped_ptr<SymmetricKey> user_salt(SymmetricKey::DeriveKeyFromPassword(
- SymmetricKey::HMAC_SHA1, salt_password.str(),
- kSaltSalt,
- kSaltIterations,
+ std::unique_ptr<SymmetricKey> user_salt(SymmetricKey::DeriveKeyFromPassword(
+ SymmetricKey::HMAC_SHA1, salt_password.str(), kSaltSalt, kSaltIterations,
kSaltKeySizeInBits));
DCHECK(user_salt.get());
« sync/util/cryptographer_unittest.cc ('K') | « sync/util/nigori.h ('k') | sync/util/nigori_unittest.cc » ('j') | sync/util/nigori_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698