Fix openssl after singleton refactor

net/base/x509_certificate_openssl.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 "net/base/x509_certificate.h"
 
 #include <openssl/asn1.h>
 #include <openssl/crypto.h>
 #include <openssl/obj_mac.h>
 #include <openssl/pem.h>
@@ skipping 188 matching lines @@
   DERCache* der_cache = static_cast<DERCache*>(ptr);
   if (!der_cache)
       return;
   if (der_cache->data)
       OPENSSL_free(der_cache->data);
   OPENSSL_free(der_cache);
 }
 
 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.
     return Singleton<X509InitSingleton,
                      LeakySingletonTraits<X509InitSingleton> >::get();
   }
   int der_cache_ex_index() const { return der_cache_ex_index_; }
   X509_STORE* store() const { return store_.get(); }
 
  private:
@@ skipping 32 matching lines @@
   internal_cache->data_length = data_length;
   X509_set_ex_data(cert, x509_der_cache_index, internal_cache);
   return internal_cache;
 }
 
 // Returns true if |der_cache| points to valid data, false otherwise.
 // (note: the DER-encoded data in |der_cache| is owned by |cert|, callers should
 // 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
   // certificate and cache the data within the X509 cert using X509_set_ex_data.
   DERCache* internal_cache = static_cast<DERCache*>(
       X509_get_ex_data(cert, x509_der_cache_index));
   if (!internal_cache) {
     unsigned char* data = NULL;
     int data_length = i2d_X509(cert, &data);
     if (data_length <= 0 || !data)
@@ skipping 112 matching lines @@
   dns_names->clear();
 
   ParseSubjectAltNames(cert_handle_, dns_names);
 
   if (dns_names->empty())
     dns_names->push_back(subject_.common_name);
 }
 
 // static
 X509_STORE* X509Certificate::cert_store() {
-  return X509InitSingleton::Get()->store();
+  return X509InitSingleton::GetInstance()->store();
 }
 
 int X509Certificate::Verify(const std::string& hostname,
                             int flags,
                             CertVerifyResult* verify_result) const {
   verify_result->Reset();
 
   // TODO(joth): We should fetch the subjectAltNames directly rather than via
   // GetDNSNames, so we can apply special handling for IP addresses vs DNS
   // names, etc. See http://crbug.com/62973.
@@ skipping 48 matching lines @@
   // cache the DER (if not already cached via X509_set_ex_data).
   DERCache der_cache_a, der_cache_b;
 
   return GetDERAndCacheIfNeeded(a, &der_cache_a) &&
       GetDERAndCacheIfNeeded(b, &der_cache_b) &&
       der_cache_a.data_length == der_cache_b.data_length &&
       memcmp(der_cache_a.data, der_cache_b.data, der_cache_a.data_length) == 0;
 }
 
 } // namespace net