Index: crypto/openssl_util.cc |
diff --git a/crypto/openssl_util.cc b/crypto/openssl_util.cc |
index d89857f3851d71f9f36eac07091201c510ef69a4..f5b20c9e0c223b4287afeed70ee445341a267483 100644 |
--- a/crypto/openssl_util.cc |
+++ b/crypto/openssl_util.cc |
@@ -35,11 +35,12 @@ class OpenSSLInitSingleton { |
// 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>; |
+ friend struct base::DefaultSingletonTraits<OpenSSLInitSingleton>; |
OpenSSLInitSingleton() { |
#if defined(OS_ANDROID) && defined(ARCH_CPU_ARMEL) |
const bool has_neon = |