Make the OCSP Init Singleton Lazy

net/cert_net/nss_ocsp.cc

Index: net/cert_net/nss_ocsp.cc
diff --git a/net/cert_net/nss_ocsp.cc b/net/cert_net/nss_ocsp.cc
index 6b73cd5844f0d190fc8f5376e4578decd980402b..40b79da95234e9d534e7e7af6b4fc353f62b8326 100644
--- a/net/cert_net/nss_ocsp.cc
+++ b/net/cert_net/nss_ocsp.cc
@@ -171,7 +171,7 @@ class OCSPNSSInitialization {
   DISALLOW_COPY_AND_ASSIGN(OCSPNSSInitialization);
 };
 
-base::LazyInstance<OCSPNSSInitialization> g_ocsp_nss_initialization =
+base::LazyInstance<OCSPNSSInitialization>::Leaky g_ocsp_nss_initialization =
     LAZY_INSTANCE_INITIALIZER;
 
 // Concrete class for SEC_HTTP_REQUEST_SESSION.
@@ -594,10 +594,6 @@ OCSPNSSInitialization::OCSPNSSInitialization() {
 }
 
 OCSPNSSInitialization::~OCSPNSSInitialization() {
-  SECStatus status = CERT_RegisterAlternateOCSPAIAInfoCallBack(NULL, NULL);
-  if (status != SECSuccess) {
-    LOG(ERROR) << "Error unregistering OCSP: " << PR_GetError();
-  }
 }