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

media/cast/common/transport_encryption_handler.cc

 // Copyright 2014 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 "media/cast/common/transport_encryption_handler.h"
 
 #include <stddef.h>
 
 #include "base/logging.h"
 #include "crypto/encryptor.h"
@@ skipping 33 matching lines @@
 TransportEncryptionHandler::TransportEncryptionHandler()
     : key_(), encryptor_(), iv_mask_(), is_activated_(false) {}
 
 TransportEncryptionHandler::~TransportEncryptionHandler() {}
 
 bool TransportEncryptionHandler::Initialize(const std::string& aes_key,
                                             const std::string& aes_iv_mask) {
   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;
   } else if (aes_iv_mask.size() != 0 || aes_key.size() != 0) {
     DCHECK_EQ(aes_iv_mask.size(), 0u)
         << "Invalid Crypto configuration: aes_iv_mask.size";
     DCHECK_EQ(aes_key.size(), 0u)
         << "Invalid Crypto configuration: aes_key.size";
     return false;
   }
@@ skipping 28 matching lines @@
   }
   if (!encryptor_->Decrypt(ciphertext, plaintext)) {
     VLOG(1) << "Decryption error";
     return false;
   }
   return true;
 }
 
 }  // namespace cast
 }  // namespace media