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

Unified Diff: base/openssl_util.cc

Issue 5767005: Fix openssl after singleton refactor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 10 years 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 | « no previous file | net/base/openssl_memory_private_key_store.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/openssl_util.cc
diff --git a/base/openssl_util.cc b/base/openssl_util.cc
index 8d476098a23cc44f9c1977994f062c792a594800..bc174fac91f744258a4dbef741db957be795deed 100644
--- a/base/openssl_util.cc
+++ b/base/openssl_util.cc
@@ -24,7 +24,7 @@ unsigned long CurrentThreadId() {
// Singleton for initializing and cleaning up the OpenSSL library.
class OpenSSLInitSingleton {
public:
- static OpenSSLInitSingleton* Get() {
+ static OpenSSLInitSingleton* GetInstance() {
// We allow the SSL environment to leak for multiple reasons:
// - it is used from a non-joinable worker thread that is not stopped on
// shutdown, hence may still be using OpenSSL library after the AtExit
@@ -58,7 +58,7 @@ class OpenSSLInitSingleton {
}
static void LockingCallback(int mode, int n, const char* file, int line) {
- OpenSSLInitSingleton::Get()->OnLockingCallback(mode, n, file, line);
+ OpenSSLInitSingleton::GetInstance()->OnLockingCallback(mode, n, file, line);
}
void OnLockingCallback(int mode, int n, const char* file, int line) {
@@ -92,7 +92,7 @@ int OpenSSLErrorCallback(const char* str, size_t len, void* context) {
} // namespace
void EnsureOpenSSLInit() {
- (void)OpenSSLInitSingleton::Get();
+ (void)OpenSSLInitSingleton::GetInstance();
}
void ClearOpenSSLERRStack(const tracked_objects::Location& location) {
« no previous file with comments | « no previous file | net/base/openssl_memory_private_key_store.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698