| Index: crypto/scoped_openssl_types.h
|
| diff --git a/crypto/scoped_openssl_types.h b/crypto/scoped_openssl_types.h
|
| index 9bc5d7430930bde02e7ffb299b0c273f78c582c6..76dd0f4cd7da7d939d40203e4cbb4d26fc8e3b9c 100644
|
| --- a/crypto/scoped_openssl_types.h
|
| +++ b/crypto/scoped_openssl_types.h
|
| @@ -15,7 +15,7 @@
|
| #include <openssl/rsa.h>
|
| #include <stdint.h>
|
|
|
| -#include "base/memory/scoped_ptr.h"
|
| +#include <memory>
|
|
|
| namespace crypto {
|
|
|
| @@ -29,7 +29,7 @@ struct OpenSSLDestroyer {
|
|
|
| template <typename PointerType, void (*Destroyer)(PointerType*)>
|
| using ScopedOpenSSL =
|
| - scoped_ptr<PointerType, OpenSSLDestroyer<PointerType, Destroyer>>;
|
| + std::unique_ptr<PointerType, OpenSSLDestroyer<PointerType, Destroyer>>;
|
|
|
| struct OpenSSLFree {
|
| void operator()(uint8_t* ptr) const { OPENSSL_free(ptr); }
|
| @@ -53,7 +53,7 @@ using ScopedEVP_PKEY_CTX = ScopedOpenSSL<EVP_PKEY_CTX, EVP_PKEY_CTX_free>;
|
| using ScopedRSA = ScopedOpenSSL<RSA, RSA_free>;
|
|
|
| // The bytes must have been allocated with OPENSSL_malloc.
|
| -using ScopedOpenSSLBytes = scoped_ptr<uint8_t, OpenSSLFree>;
|
| +using ScopedOpenSSLBytes = std::unique_ptr<uint8_t, OpenSSLFree>;
|
|
|
| } // namespace crypto
|
|
|
|
|