Require explicit selection of traits for LazyInstance

net/ssl/client_key_store.h

 // Copyright 2015 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.
 
 #ifndef NET_SSL_CLIENT_KEY_STORE_H_
 #define NET_SSL_CLIENT_KEY_STORE_H_
 
 #include <memory>
 #include <vector>
 
@@ skipping 40 matching lines @@
 
   void RemoveProvider(const CertKeyProvider* provider);
 
   // Given a |certificate|'s public key, return the corresponding private
   // key if any of the registered providers has a matching key.
   // Returns its matching private key on success, nullptr otherwise.
   scoped_refptr<SSLPrivateKey> FetchClientCertPrivateKey(
       const X509Certificate& certificate);
 
  private:
-  friend struct base::DefaultLazyInstanceTraits<ClientKeyStore>;
+  friend struct base::LazyInstanceTraitsBase<ClientKeyStore>;
 
   ClientKeyStore();
   ~ClientKeyStore();
 
   base::Lock lock_;
   std::vector<CertKeyProvider*> providers_;
 
   DISALLOW_COPY_AND_ASSIGN(ClientKeyStore);
 };
 
 }  // namespace net
 
 #endif  // NET_SSL_CLIENT_KEY_STORE_H_