Fix openssl after singleton refactor

base/openssl_util.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/openssl_util.h"
 
 #include <openssl/err.h>
 #include <openssl/ssl.h>
 
 #include "base/lock.h"
 #include "base/logging.h"
 #include "base/scoped_vector.h"
 #include "base/singleton.h"
 #include "base/string_piece.h"
 
 namespace base {
 
 namespace {
 
 unsigned long CurrentThreadId() {
   return static_cast<unsigned long>(PlatformThread::CurrentId());
 }
 
 // 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
     //      runner has completed.
     //   -  There are other OpenSSL related singletons (e.g. the client socket
     //      context) who's cleanup depends on the global environment here, but
     //      we can't control the order the AtExit handlers will run in so
     //      allowing the global environment to leak at least ensures it is
     //      available for those other singletons to reliably cleanup.
     return Singleton<OpenSSLInitSingleton,
@@ skipping 13 matching lines @@
     CRYPTO_set_id_callback(CurrentThreadId);
   }
 
   ~OpenSSLInitSingleton() {
     CRYPTO_set_locking_callback(NULL);
     EVP_cleanup();
     ERR_free_strings();
   }
 
   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) {
     CHECK_LT(static_cast<size_t>(n), locks_.size());
     if (mode & CRYPTO_LOCK)
       locks_[n]->Acquire();
     else
       locks_[n]->Release();
   }
 
@@ skipping 13 matching lines @@
 // error queue and return, otherwise it will continue calling this function
 // until all errors have been removed from the queue.
 int OpenSSLErrorCallback(const char* str, size_t len, void* context) {
   DVLOG(1) << "\t" << StringPiece(str, len);
   return 1;
 }
 
 }  // namespace
 
 void EnsureOpenSSLInit() {
-  (void)OpenSSLInitSingleton::Get();
+  (void)OpenSSLInitSingleton::GetInstance();
 }
 
 void ClearOpenSSLERRStack(const tracked_objects::Location& location) {
   if (logging::DEBUG_MODE && VLOG_IS_ON(1)) {
     int error_num = ERR_peek_error();
     if (error_num == 0)
       return;
 
     std::string message;
     location.Write(true, true, &message);
     DVLOG(1) << "OpenSSL ERR_get_error stack from " << message;
     ERR_print_errors_cb(&OpenSSLErrorCallback, NULL);
   } else {
     ERR_clear_error();
   }
 }
 
 }  // namespace base