Make the OCSP Init Singleton Lazy

net/cert_net/nss_ocsp.cc

 // Copyright (c) 2012 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/cert_net/nss_ocsp.h"
 
 #include <certt.h>
 #include <certdb.h>
 #include <nspr.h>
 #include <nss.h>
@@ skipping 153 matching lines @@
   friend struct base::DefaultLazyInstanceTraits<OCSPNSSInitialization>;
 
   OCSPNSSInitialization();
   ~OCSPNSSInitialization();
 
   SEC_HttpClientFcn client_fcn_;
 
   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.
 // Public methods except virtual methods of URLRequest::Delegate
 // (On* methods) run on certificate verifier thread (worker thread).
 // Virtual methods of URLRequest::Delegate and private methods run
 // on IO thread.
 class OCSPRequestSession
     : public base::RefCountedThreadSafe<OCSPRequestSession>,
       public URLRequest::Delegate {
@@ skipping 402 matching lines @@
   status = CERT_RegisterAlternateOCSPAIAInfoCallBack(
       GetAlternateOCSPAIAInfo, &old_callback);
   if (status == SECSuccess) {
     DCHECK(!old_callback);
   } else {
     NOTREACHED() << "Error initializing OCSP: " << PR_GetError();
   }
 }
 
 OCSPNSSInitialization::~OCSPNSSInitialization() {
-  SECStatus status = CERT_RegisterAlternateOCSPAIAInfoCallBack(NULL, NULL);
-  if (status != SECSuccess) {
-    LOG(ERROR) << "Error unregistering OCSP: " << PR_GetError();
-  }
 }
 
 
 // OCSP Http Client functions.
 // Our Http Client functions operate in blocking mode.
 SECStatus OCSPCreateSession(const char* host, PRUint16 portnum,
                             SEC_HTTP_SERVER_SESSION* pSession) {
   VLOG(1) << "OCSP create session: host=" << host << " port=" << portnum;
   pthread_mutex_lock(&g_request_context_lock);
   URLRequestContext* request_context = g_request_context;
@@ skipping 355 matching lines @@
 void SetURLRequestContextForNSSHttpIO(URLRequestContext* request_context) {
   pthread_mutex_lock(&g_request_context_lock);
   if (request_context) {
     DCHECK(!g_request_context);
   }
   g_request_context = request_context;
   pthread_mutex_unlock(&g_request_context_lock);
 }
 
 }  // namespace net