Require explicit selection of traits for LazyInstance

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 88 matching lines @@
       // CalledOnValidThread is the only available API to reassociate
       // thread_checker_ with the current thread. Result ignored intentionally.
       ignore_result(thread_checker_.CalledOnValidThread());
       shutdown_ = false;
       used_ = false;
     }
     StartUsing();
   }
 
  private:
-  friend struct base::DefaultLazyInstanceTraits<OCSPIOLoop>;
+  friend struct base::LazyInstanceTraitsBase<OCSPIOLoop>;
 
   OCSPIOLoop();
 
   void CancelAllRequests();
 
   mutable base::Lock lock_;
   bool shutdown_;  // Protected by |lock_|.
   std::set<OCSPRequestSession*> requests_;  // Protected by |lock_|.
   bool used_;  // Protected by |lock_|.
   // This should not be modified after |used_|.
@@ skipping 37 matching lines @@
                                 const char** http_response_content_type,
                                 const char** http_response_headers,
                                 const char** http_response_data,
                                 PRUint32* http_response_data_len);
 SECStatus OCSPFree(SEC_HTTP_REQUEST_SESSION request);
 
 char* GetAlternateOCSPAIAInfo(CERTCertificate *cert);
 
 class OCSPNSSInitialization {
  private:
-  friend struct base::DefaultLazyInstanceTraits<OCSPNSSInitialization>;
+  friend struct base::LazyInstanceTraitsBase<OCSPNSSInitialization>;
 
   OCSPNSSInitialization();
   // This class is only instantiated as a leaky LazyInstance, so its destructor
   // is never called.
   ~OCSPNSSInitialization() = delete;
 
   SEC_HttpClientFcn client_fcn_;
 
   DISALLOW_COPY_AND_ASSIGN(OCSPNSSInitialization);
 };
@@ skipping 766 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