Index: crypto/openssl_util.cc |
=================================================================== |
--- crypto/openssl_util.cc (revision 79901) |
+++ crypto/openssl_util.cc (working copy) |
@@ -2,7 +2,7 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "base/openssl_util.h" |
+#include "crypto/openssl_util.h" |
#include <openssl/err.h> |
#include <openssl/ssl.h> |
@@ -13,12 +13,12 @@ |
#include "base/string_piece.h" |
#include "base/synchronization/lock.h" |
-namespace base { |
+namespace crypto { |
namespace { |
unsigned long CurrentThreadId() { |
- return static_cast<unsigned long>(PlatformThread::CurrentId()); |
+ return static_cast<unsigned long>(base::PlatformThread::CurrentId()); |
} |
// Singleton for initializing and cleaning up the OpenSSL library. |
@@ -34,8 +34,8 @@ |
// we can't control the order the AtExit handlers will run in so |
// allowing the global environment to leak at least ensures it is |
// available for those other singletons to reliably cleanup. |
- return Singleton<OpenSSLInitSingleton, |
- LeakySingletonTraits<OpenSSLInitSingleton> >::get(); |
+ return base::Singleton<OpenSSLInitSingleton, |
+ base::LeakySingletonTraits<OpenSSLInitSingleton> >::get(); |
} |
private: |
friend struct DefaultSingletonTraits<OpenSSLInitSingleton>; |
@@ -110,4 +110,4 @@ |
} |
} |
-} // namespace base |
+} // namespace crypto |