Convert all remaining explicit LeakyLazyInstanceTraits users to ::Leaky

net/base/test_root_certs_win.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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/base/test_root_certs.h"
 
 #include <windows.h>
 #include <wincrypt.h>
 
 #include "base/basictypes.h"
 #include "base/lazy_instance.h"
@@ skipping 70 matching lines @@
   // This is never called, because this object is intentionally leaked.
   // Certificate verification happens on a non-joinable worker thread, which
   // may still be running when ~AtExitManager is called, so the LazyInstance
   // must be leaky.
   ~CryptoAPIInjector() {
     original_function = NULL;
     CryptFreeOIDFunctionAddress(original_handle, NULL);
   }
 };
 
-base::LazyInstance<CryptoAPIInjector,
-                   base::LeakyLazyInstanceTraits<CryptoAPIInjector> >
+base::LazyInstance<CryptoAPIInjector>::Leaky
     g_capi_injector = LAZY_INSTANCE_INITIALIZER;
 
 BOOL WINAPI InterceptedOpenStoreW(LPCSTR store_provider,
                                   DWORD encoding,
                                   HCRYPTPROV crypt_provider,
                                   DWORD flags,
                                   const void* store_name,
                                   HCERTSTORE memory_store,
                                   PCERT_STORE_PROV_INFO store_info) {
   // If the high word is all zeroes, then |store_provider| is a numeric ID.
@@ skipping 101 matching lines @@
 
 void TestRootCerts::Init() {
   empty_ = true;
   temporary_roots_ = CertOpenStore(
       CERT_STORE_PROV_MEMORY, 0, NULL,
       CERT_STORE_DEFER_CLOSE_UNTIL_LAST_FREE_FLAG, NULL);
   DCHECK(temporary_roots_);
 }
 
 }  // namespace net