Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(97)

Unified Diff: net/base/openssl_private_key_store_android.cc

Issue 10580038: Allow OpenSSLPrivateKeyStore and Android global app context leaking. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/android/jni_android.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
};
« no previous file with comments | « base/android/jni_android.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698