summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
Diffstat (limited to 'crypto')
-rw-r--r--crypto/encryptor.h4
-rw-r--r--crypto/sha2.cc2
2 files changed, 3 insertions, 3 deletions
diff --git a/crypto/encryptor.h b/crypto/encryptor.h
index 0de6358..a407266 100644
--- a/crypto/encryptor.h
+++ b/crypto/encryptor.h
@@ -9,7 +9,7 @@
#include <string>
#include "base/basictypes.h"
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
#include "base/string_piece.h"
#include "build/build_config.h"
#include "crypto/crypto_export.h"
@@ -35,7 +35,7 @@ class CRYPTO_EXPORT Encryptor {
// Only 128-bits counter is supported in this class.
class Counter {
public:
- Counter(const base::StringPiece& counter);
+ explicit Counter(const base::StringPiece& counter);
~Counter();
// Increment the counter value.
diff --git a/crypto/sha2.cc b/crypto/sha2.cc
index 7626bdc..a757df6 100644
--- a/crypto/sha2.cc
+++ b/crypto/sha2.cc
@@ -4,7 +4,7 @@
#include "crypto/sha2.h"
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
#include "base/stl_util.h"
#include "crypto/secure_hash.h"