| Index: net/base/x509_certificate_openssl.cc
|
| diff --git a/net/base/x509_certificate_openssl.cc b/net/base/x509_certificate_openssl.cc
|
| index 0d55c35d15965ee0f10a5390ad36b907a723b960..cee803f2d424dd7ded806eaf5348c4088b7f93ba 100644
|
| --- a/net/base/x509_certificate_openssl.cc
|
| +++ b/net/base/x509_certificate_openssl.cc
|
| @@ -206,7 +206,7 @@ void DERCache_free(void* parent, void* ptr, CRYPTO_EX_DATA* ad, int idx,
|
|
|
| class X509InitSingleton {
|
| public:
|
| - static X509InitSingleton* Get() {
|
| + static X509InitSingleton* GetInstance() {
|
| // We allow the X509 store to leak, because it is used from a non-joinable
|
| // worker that is not stopped on shutdown, hence may still be using
|
| // OpenSSL library after the AtExit runner has completed.
|
| @@ -259,7 +259,8 @@ DERCache* SetDERCache(X509Certificate::OSCertHandle cert,
|
| // not free it).
|
| bool GetDERAndCacheIfNeeded(X509Certificate::OSCertHandle cert,
|
| DERCache* der_cache) {
|
| - int x509_der_cache_index = X509InitSingleton::Get()->der_cache_ex_index();
|
| + int x509_der_cache_index =
|
| + X509InitSingleton::GetInstance()->der_cache_ex_index();
|
|
|
| // Re-encoding the DER data via i2d_X509 is an expensive operation, but it's
|
| // necessary for comparing two certificates. We re-encode at most once per
|
| @@ -392,7 +393,7 @@ void X509Certificate::GetDNSNames(std::vector<std::string>* dns_names) const {
|
|
|
| // static
|
| X509_STORE* X509Certificate::cert_store() {
|
| - return X509InitSingleton::Get()->store();
|
| + return X509InitSingleton::GetInstance()->store();
|
| }
|
|
|
| int X509Certificate::Verify(const std::string& hostname,
|
|
|