commit 10f97f3bfcecc3fbe8e9f02e7c426f7e340f7f54
author Adam Langley <agl@google.com> Tue Jul 12 08:09:33 2016 -0700
committer Adam Langley <agl@google.com> Tue Jul 12 08:09:33 2016 -0700
tree 3a23df61db5dc580eeb23916bf8955f5fcedc6cd
parent d2b5af56cf2a8b4695821b2ff64a7bfc82f3ba5e

Revert "Move C++ helpers into |bssl| namespace."

This reverts commit 09feb0f3d95a2bc58ce0faaf14256d3bd30f52a4.

(In order to make WebRTC happy this also needs to be reverted.)

crypto/bio/bio_test.cc

diff --git a/crypto/bio/bio_test.cc b/crypto/bio/bio_test.cc
index e7c061e..f2eb20b 100644
--- a/crypto/bio/bio_test.cc
+++ b/crypto/bio/bio_test.cc
@@ -43,8 +43,6 @@
 #include "../test/scoped_types.h"
 
 
-namespace bssl {
-
 #if !defined(OPENSSL_WINDOWS)
 static int closesocket(int sock) {
   return close(sock);
@@ -341,7 +339,7 @@
   if (!ok) {
     out = nullptr;
   }
-  ScopedBytes out_storage(out);
+  ScopedOpenSSLBytes out_storage(out);
 
   if (should_succeed != (ok == 1)) {
     return false;
@@ -371,7 +369,7 @@
   static const size_t kLargePayloadLen = 8000;
   static const uint8_t kLargePrefix[] = {0x30, 0x82, kLargePayloadLen >> 8,
                                          kLargePayloadLen & 0xff};
-  ScopedBytes large(reinterpret_cast<uint8_t *>(
+  ScopedOpenSSLBytes large(reinterpret_cast<uint8_t *>(
       OPENSSL_malloc(sizeof(kLargePrefix) + kLargePayloadLen)));
   if (!large) {
     return false;
@@ -412,8 +410,6 @@
   return true;
 }
 
-}  // namespace bssl
-
 int main(void) {
   CRYPTO_library_init();
 
@@ -432,10 +428,10 @@
   }
 #endif
 
-  if (!bssl::TestSocketConnect() ||
-      !bssl::TestPrintf() ||
-      !bssl::TestZeroCopyBioPairs() ||
-      !bssl::TestASN1()) {
+  if (!TestSocketConnect() ||
+      !TestPrintf() ||
+      !TestZeroCopyBioPairs() ||
+      !TestASN1()) {
     return 1;
   }