| Index: net/socket/ssl_client_socket_openssl.cc
|
| diff --git a/net/socket/ssl_client_socket_openssl.cc b/net/socket/ssl_client_socket_openssl.cc
|
| index 721b69c02e2a36846d55cc8966b5c5e5c3c7e8f7..05d6cc77bc23108df321255f711f7cd2f12d427f 100644
|
| --- a/net/socket/ssl_client_socket_openssl.cc
|
| +++ b/net/socket/ssl_client_socket_openssl.cc
|
| @@ -202,7 +202,9 @@ base::LazyInstance<PlatformKeyTaskRunner>::Leaky g_platform_key_task_runner =
|
|
|
| class SSLClientSocketOpenSSL::SSLContext {
|
| public:
|
| - static SSLContext* GetInstance() { return Singleton<SSLContext>::get(); }
|
| + static SSLContext* GetInstance() {
|
| + return base::Singleton<SSLContext>::get();
|
| + }
|
| SSL_CTX* ssl_ctx() { return ssl_ctx_.get(); }
|
| SSLClientSessionCacheOpenSSL* session_cache() { return &session_cache_; }
|
|
|
| @@ -221,7 +223,7 @@ class SSLClientSocketOpenSSL::SSLContext {
|
| static const SSL_PRIVATE_KEY_METHOD kPrivateKeyMethod;
|
|
|
| private:
|
| - friend struct DefaultSingletonTraits<SSLContext>;
|
| + friend struct base::DefaultSingletonTraits<SSLContext>;
|
|
|
| SSLContext() : session_cache_(SSLClientSessionCacheOpenSSL::Config()) {
|
| crypto::EnsureOpenSSLInit();
|
|
|