summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorjoth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-14 11:52:47 +0000
committerjoth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-14 11:52:47 +0000
commitb29af7d99bd1aede0ebb49e940dcb2fa319767cc (patch)
treef50c9516c16bb2198f485b8ff6686b6055b681a9 /base
parente7931f3b1a2fd07b23e77b30c41770912f0784c3 (diff)
downloadchromium_src-b29af7d99bd1aede0ebb49e940dcb2fa319767cc.zip
chromium_src-b29af7d99bd1aede0ebb49e940dcb2fa319767cc.tar.gz
chromium_src-b29af7d99bd1aede0ebb49e940dcb2fa319767cc.tar.bz2
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
Diffstat (limited to 'base')
-rw-r--r--base/openssl_util.cc6
1 files changed, 3 insertions, 3 deletions
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) {