| Index: crypto/encryptor.h
|
| diff --git a/crypto/encryptor.h b/crypto/encryptor.h
|
| index e07eb3233b31df76c0d47540f161acc4f72896b8..f1a478ad844cb2a91f4530ea88c26a5f48aec592 100644
|
| --- a/crypto/encryptor.h
|
| +++ b/crypto/encryptor.h
|
| @@ -8,9 +8,9 @@
|
| #include <stddef.h>
|
| #include <stdint.h>
|
|
|
| +#include <memory>
|
| #include <string>
|
|
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/strings/string_piece.h"
|
| #include "build/build_config.h"
|
| #include "crypto/crypto_export.h"
|
| @@ -113,7 +113,7 @@ class CRYPTO_EXPORT Encryptor {
|
|
|
| SymmetricKey* key_;
|
| Mode mode_;
|
| - scoped_ptr<Counter> counter_;
|
| + std::unique_ptr<Counter> counter_;
|
|
|
| #if defined(USE_OPENSSL)
|
| bool Crypt(bool do_encrypt, // Pass true to encrypt, false to decrypt.
|
|
|