| Index: net/base/openssl_private_key_store_android.cc
|
| ===================================================================
|
| --- net/base/openssl_private_key_store_android.cc (revision 154951)
|
| +++ net/base/openssl_private_key_store_android.cc (working copy)
|
| @@ -47,13 +47,20 @@
|
| }
|
|
|
| static OpenSSLKeyStoreAndroid* GetInstance() {
|
| - return Singleton<OpenSSLKeyStoreAndroid>::get();
|
| + // Leak the OpenSSL key store as it is used from a non-joinable worker
|
| + // thread that may still be running at shutdown.
|
| + return Singleton<
|
| + OpenSSLKeyStoreAndroid,
|
| + OpenSSLKeyStoreAndroidLeakyTraits>::get();
|
| }
|
|
|
| private:
|
| - OpenSSLKeyStoreAndroid() {}
|
| friend struct DefaultSingletonTraits<OpenSSLKeyStoreAndroid>;
|
| + typedef LeakySingletonTraits<OpenSSLKeyStoreAndroid>
|
| + OpenSSLKeyStoreAndroidLeakyTraits;
|
|
|
| + OpenSSLKeyStoreAndroid() {}
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(OpenSSLKeyStoreAndroid);
|
| };
|
|
|
|
|