Make //crypto factories return std::unique_ptr<>s

sync/util/nigori.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sync/util/nigori.h"
 
 #include <stdint.h>
 
 #include <sstream>
 #include <vector>
@@ skipping 59 matching lines @@
 bool Nigori::InitByDerivation(const std::string& hostname,
                               const std::string& username,
                               const std::string& password) {
   NigoriStream salt_password;
   salt_password << username << hostname;
 
   // Suser = PBKDF2(Username || Servername, "saltsalt", Nsalt, 8)
   std::unique_ptr<SymmetricKey> user_salt(SymmetricKey::DeriveKeyFromPassword(
       SymmetricKey::HMAC_SHA1, salt_password.str(), kSaltSalt, kSaltIterations,
       kSaltKeySizeInBits));
-  DCHECK(user_salt.get());
+  DCHECK(user_salt);
 
   std::string raw_user_salt;
   if (!user_salt->GetRawKey(&raw_user_salt))
     return false;
 
   // Kuser = PBKDF2(P, Suser, Nuser, 16)
-  user_key_.reset(SymmetricKey::DeriveKeyFromPassword(SymmetricKey::AES,
-      password, raw_user_salt, kUserIterations, kDerivedKeySizeInBits));
-  DCHECK(user_key_.get());
+  user_key_ = SymmetricKey::DeriveKeyFromPassword(
+      SymmetricKey::AES, password, raw_user_salt, kUserIterations,
+      kDerivedKeySizeInBits);
+  DCHECK(user_key_);
 
   // Kenc = PBKDF2(P, Suser, Nenc, 16)
-  encryption_key_.reset(SymmetricKey::DeriveKeyFromPassword(SymmetricKey::AES,
-      password, raw_user_salt, kEncryptionIterations, kDerivedKeySizeInBits));
-  DCHECK(encryption_key_.get());
+  encryption_key_ = SymmetricKey::DeriveKeyFromPassword(
+      SymmetricKey::AES, password, raw_user_salt, kEncryptionIterations,
+      kDerivedKeySizeInBits);
+  DCHECK(encryption_key_);
 
   // Kmac = PBKDF2(P, Suser, Nmac, 16)
-  mac_key_.reset(SymmetricKey::DeriveKeyFromPassword(
+  mac_key_ = SymmetricKey::DeriveKeyFromPassword(
       SymmetricKey::HMAC_SHA1, password, raw_user_salt, kSigningIterations,
-      kDerivedKeySizeInBits));
-  DCHECK(mac_key_.get());
+      kDerivedKeySizeInBits);
+  DCHECK(mac_key_);
 
-  return user_key_.get() && encryption_key_.get() && mac_key_.get();
+  return user_key_ && encryption_key_ && mac_key_;
 }
 
 bool Nigori::InitByImport(const std::string& user_key,
                           const std::string& encryption_key,
                           const std::string& mac_key) {
-  user_key_.reset(SymmetricKey::Import(SymmetricKey::AES, user_key));
-  DCHECK(user_key_.get());
+  user_key_ = SymmetricKey::Import(SymmetricKey::AES, user_key);
+  DCHECK(user_key_);
 
-  encryption_key_.reset(SymmetricKey::Import(SymmetricKey::AES,
-                                             encryption_key));
-  DCHECK(encryption_key_.get());
+  encryption_key_ = SymmetricKey::Import(SymmetricKey::AES, encryption_key);
+  DCHECK(encryption_key_);
 
-  mac_key_.reset(SymmetricKey::Import(SymmetricKey::HMAC_SHA1, mac_key));
-  DCHECK(mac_key_.get());
+  mac_key_ = SymmetricKey::Import(SymmetricKey::HMAC_SHA1, mac_key);
+  DCHECK(mac_key_);
 
-  return user_key_.get() && encryption_key_.get() && mac_key_.get();
+  return user_key_ && encryption_key_ && mac_key_;
 }
 
 // Permute[Kenc,Kmac](type || name)
 bool Nigori::Permute(Type type, const std::string& name,
                      std::string* permuted) const {
   DCHECK_LT(0U, name.size());
 
   NigoriStream plaintext;
   plaintext << type << name;
 
@@ skipping 113 matching lines @@
   DCHECK(user_key);
   DCHECK(encryption_key);
   DCHECK(mac_key);
 
   return user_key_->GetRawKey(user_key) &&
       encryption_key_->GetRawKey(encryption_key) &&
       mac_key_->GetRawKey(mac_key);
 }
 
 }  // namespace syncer