From b29af7d99bd1aede0ebb49e940dcb2fa319767cc Mon Sep 17 00:00:00 2001 From: "joth@chromium.org" Date: Tue, 14 Dec 2010 11:52:47 +0000 Subject: Fix openssl after singleton refactor BUG=65298 TEST=Builds Review URL: http://codereview.chromium.org/5767005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69123 0039d316-1c4b-4281-b951-d872f2087c98 --- base/openssl_util.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'base/openssl_util.cc') diff --git a/base/openssl_util.cc b/base/openssl_util.cc index 8d47609..bc174fa 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) { -- cgit v1.1