Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(390)

Unified Diff: net/socket/ssl_client_socket_openssl.cc

Issue 1308823002: Move Singleton and related structs to namespace base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ToT Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/quic/crypto/quic_random.cc ('k') | net/socket/websocket_endpoint_lock_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 ac0f0912b5385df1f97b0e2b37904dde941da987..171bd36406c0ef06130dab637b6549735f30f7ee 100644
--- a/net/socket/ssl_client_socket_openssl.cc
+++ b/net/socket/ssl_client_socket_openssl.cc
@@ -200,7 +200,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_; }
@@ -219,7 +221,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();
« no previous file with comments | « net/quic/crypto/quic_random.cc ('k') | net/socket/websocket_endpoint_lock_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698