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

chrome/browser/chromeos/settings/token_encryptor.cc

 // Copyright 2013 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 "chrome/browser/chromeos/settings/token_encryptor.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <vector>
@@ skipping 13 matching lines @@
 namespace {
 const size_t kNonceSize = 16;
 }  // namespace
 
 CryptohomeTokenEncryptor::CryptohomeTokenEncryptor(
     const std::string& system_salt)
     : system_salt_(system_salt) {
   DCHECK(!system_salt.empty());
   // TODO(davidroche): should this use the system salt for both the password
   // and the salt value, or should this use a separate salt value?
-  system_salt_key_.reset(PassphraseToKey(system_salt_, system_salt_));
+  system_salt_key_ = PassphraseToKey(system_salt_, system_salt_);
 }
 
 CryptohomeTokenEncryptor::~CryptohomeTokenEncryptor() {
 }
 
 std::string CryptohomeTokenEncryptor::EncryptWithSystemSalt(
     const std::string& token) {
   // Don't care about token encryption while debugging.
   if (!base::SysInfo::IsRunningOnChromeOS())
     return token;
@@ skipping 15 matching lines @@
 
   if (!system_salt_key_) {
     LOG(WARNING) << "System salt key is not available for decrypt.";
     return std::string();
   }
   return DecryptTokenWithKey(system_salt_key_.get(),
                              system_salt_,
                              encrypted_token_hex);
 }
 
-crypto::SymmetricKey* CryptohomeTokenEncryptor::PassphraseToKey(
+std::unique_ptr<crypto::SymmetricKey> CryptohomeTokenEncryptor::PassphraseToKey(
     const std::string& passphrase,
     const std::string& salt) {
   return crypto::SymmetricKey::DeriveKeyFromPassword(
       crypto::SymmetricKey::AES, passphrase, salt, 1000, 256);
 }
 
 std::string CryptohomeTokenEncryptor::EncryptTokenWithKey(
     crypto::SymmetricKey* key,
     const std::string& salt,
     const std::string& token) {
@@ skipping 38 matching lines @@
   std::string token;
   CHECK(encryptor.SetCounter(nonce));
   if (!encryptor.Decrypt(encrypted_token, &token)) {
     LOG(WARNING) << "Failed to decrypt token.";
     return std::string();
   }
   return token;
 }
 
 }  // namespace chromeos