Modify Create method of QuicEncrypter and QuicDecrypter to return a unique_ptr

Bug: 479898
Change-Id: I4c2030c8e38532a7de391360daf758dfcd1bc530
Reviewed-on: https://chromium-review.googlesource.com/820563Reviewed-by: Ryan Hamilton <rch@chromium.org>
Commit-Queue: Ryan Hamilton <rch@chromium.org>
Cr-Commit-Position: refs/heads/master@{#523644}

net/quic/core/crypto/crypto_utils.cc

@@ -94,8 +94,8 @@ bool CryptoUtils::DeriveKeys(QuicStringPiece premaster_secret,
                              Diversification diversification,
                              CrypterPair* crypters,
                              string* subkey_secret) {
-  crypters->encrypter.reset(QuicEncrypter::Create(aead));
-  crypters->decrypter.reset(QuicDecrypter::Create(aead));
+  crypters->encrypter = QuicEncrypter::Create(aead);
+  crypters->decrypter = QuicDecrypter::Create(aead);
   size_t key_bytes = crypters->encrypter->GetKeySize();
   size_t nonce_prefix_bytes = crypters->encrypter->GetNoncePrefixSize();
   size_t subkey_secret_bytes =

net/quic/core/crypto/quic_decrypter.cc

@@ -19,12 +19,12 @@
 namespace net {
 
 // static
-QuicDecrypter* QuicDecrypter::Create(QuicTag algorithm) {
+std::unique_ptr<QuicDecrypter> QuicDecrypter::Create(QuicTag algorithm) {
   switch (algorithm) {
     case kAESG:
-      return new Aes128Gcm12Decrypter();
+      return std::make_unique<Aes128Gcm12Decrypter>();
     case kCC20:
-      return new ChaCha20Poly1305Decrypter();
+      return std::make_unique<ChaCha20Poly1305Decrypter>();
     default:
       QUIC_LOG(FATAL) << "Unsupported algorithm: " << algorithm;
       return nullptr;

net/quic/core/crypto/quic_decrypter.h

@@ -7,6 +7,7 @@
 
 #include <cstddef>
 #include <cstdint>
+#include <memory>
 
 #include "net/quic/core/quic_packets.h"
 #include "net/quic/platform/api/quic_export.h"
@@ -18,7 +19,7 @@ class QUIC_EXPORT_PRIVATE QuicDecrypter {
  public:
   virtual ~QuicDecrypter() {}
 
-  static QuicDecrypter* Create(QuicTag algorithm);
+  static std::unique_ptr<QuicDecrypter> Create(QuicTag algorithm);
 
   // Creates an IETF QuicDecrypter based on |cipher_suite| which must be an id
   // returned by SSL_CIPHER_get_id. The caller is responsible for taking

net/quic/core/crypto/quic_encrypter.cc

@@ -18,12 +18,12 @@
 namespace net {
 
 // static
-QuicEncrypter* QuicEncrypter::Create(QuicTag algorithm) {
+std::unique_ptr<QuicEncrypter> QuicEncrypter::Create(QuicTag algorithm) {
   switch (algorithm) {
     case kAESG:
-      return new Aes128Gcm12Encrypter();
+      return std::make_unique<Aes128Gcm12Encrypter>();
     case kCC20:
-      return new ChaCha20Poly1305Encrypter();
+      return std::make_unique<ChaCha20Poly1305Encrypter>();
     default:
       QUIC_LOG(FATAL) << "Unsupported algorithm: " << algorithm;
       return nullptr;

net/quic/core/crypto/quic_encrypter.h

@@ -6,6 +6,7 @@
 #define NET_QUIC_CORE_CRYPTO_QUIC_ENCRYPTER_H_
 
 #include <cstddef>
+#include <memory>
 
 #include "net/quic/core/quic_packets.h"
 #include "net/quic/platform/api/quic_export.h"
@@ -17,7 +18,7 @@ class QUIC_EXPORT_PRIVATE QuicEncrypter {
  public:
   virtual ~QuicEncrypter() {}
 
-  static QuicEncrypter* Create(QuicTag algorithm);
+  static std::unique_ptr<QuicEncrypter> Create(QuicTag algorithm);
 
   // Creates an IETF QuicEncrypter based on |cipher_suite| which must be an id
   // returned by SSL_CIPHER_get_id. The caller is responsible for taking