summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-18 08:44:22 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-18 08:44:22 +0000
commit7226b33cbb1b56189c9454364fbaa9ed339691f7 (patch)
tree77eef58a6ead14b642e80abb352c55688ee230d2 /crypto
parent87b576887a6339451a33c67e43361a18189a7e04 (diff)
downloadchromium_src-7226b33cbb1b56189c9454364fbaa9ed339691f7.zip
chromium_src-7226b33cbb1b56189c9454364fbaa9ed339691f7.tar.gz
chromium_src-7226b33cbb1b56189c9454364fbaa9ed339691f7.tar.bz2
Cleanup: base/scoped_ptr.h -> base/memory/scoped_ptr.h. (part 4)
BUG=none TEST=none Review URL: http://codereview.chromium.org/7670016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97286 0039d316-1c4b-4281-b951-d872f2087c98
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"