From 3c6cf57f58e7f02c0e93250a59d23fe91d9d5397 Mon Sep 17 00:00:00 2001 From: "tfarina@chromium.org" Date: Sat, 3 Nov 2012 00:48:17 +0000 Subject: crypto: Remove forbidden using namespace directive. Instead just wrap the unittests files into the crypto namespace. TEST=crypto_unittests R=rsleevi@chromium.org Review URL: https://chromiumcodereview.appspot.com/11368035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165816 0039d316-1c4b-4281-b951-d872f2087c98 --- crypto/p224_spake_unittest.cc | 10 ++++++++-- crypto/p224_unittest.cc | 5 ++++- 2 files changed, 12 insertions(+), 3 deletions(-) (limited to 'crypto') diff --git a/crypto/p224_spake_unittest.cc b/crypto/p224_spake_unittest.cc index bcd448c..ca35f72 100644 --- a/crypto/p224_spake_unittest.cc +++ b/crypto/p224_spake_unittest.cc @@ -7,7 +7,9 @@ #include "base/logging.h" #include "testing/gtest/include/gtest/gtest.h" -using namespace crypto; +namespace crypto { + +namespace { bool RunExchange(P224EncryptedKeyExchange* client, P224EncryptedKeyExchange* server) { @@ -42,7 +44,9 @@ bool RunExchange(P224EncryptedKeyExchange* client, } } -static const char kPassword[] = "foo"; +const char kPassword[] = "foo"; + +} // namespace TEST(MutualAuth, CorrectAuth) { P224EncryptedKeyExchange client( @@ -122,3 +126,5 @@ TEST(MutualAuth, Fuzz) { } } } + +} // namespace crypto diff --git a/crypto/p224_unittest.cc b/crypto/p224_unittest.cc index c6acfdd..ef9e305 100644 --- a/crypto/p224_unittest.cc +++ b/crypto/p224_unittest.cc @@ -9,7 +9,8 @@ #include "testing/gtest/include/gtest/gtest.h" -using namespace crypto; +namespace crypto { + using p224::Point; // kBasePointExternal is the P224 base point in external representation. @@ -819,3 +820,5 @@ TEST(P224, Infinity) { // We shouldn't allow ∞ to be imported. EXPECT_FALSE(a.SetFromString(std::string(zeros, sizeof(zeros)))); } + +} // namespace crypto -- cgit v1.1