Allow OpenSSLPrivateKeyStore and Android global app context leaking.

net/base/openssl_private_key_store_android.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/base/openssl_private_key_store.h"
 
 #include <openssl/evp.h>
 
 #include "base/logging.h"
 #include "base/memory/singleton.h"
 #include "crypto/openssl_util.h"
 #include "net/android/network_library.h"
 
 namespace net {
 
 namespace {
 
 class OpenSSLKeyStoreAndroid : public OpenSSLPrivateKeyStore {
  public:
+  typedef LeakySingletonTraits<OpenSSLKeyStoreAndroid>
+      OpenSSLKeyStoreAndroidLeakyTraits;

[Ryan Sleevi, 2012/09/06 18:23:35]

Sorry, this was my bug in my nit. This doesn't need to be a public typedef - it
can be moved between lines 60 and 61 (with a newline before the current line 61)

[Johnny(Jianning) Ding, 2012/09/07 04:33:07]

Done.

   ~OpenSSLKeyStoreAndroid() {}
 
   // TODO(joth): Use the |url| to help identify this key to the user.
   // Currently Android has no UI to list these stored private keys (and no
   // API to associate a name with them), so this is a non-issue.
   virtual bool StorePrivateKey(const GURL& url, EVP_PKEY* pkey) {
     uint8* public_key = NULL;
     int public_len = i2d_PublicKey(pkey, &public_key);
     uint8* private_key = NULL;
     int private_len = i2d_PrivateKey(pkey, &private_key);
@@ skipping 10 matching lines @@
     return ret;
   }
 
   virtual EVP_PKEY* FetchPrivateKey(EVP_PKEY* pkey) {
     // TODO(joth): Implement when client authentication is required.
     NOTIMPLEMENTED();
     return NULL;
   }
 
   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:
+  friend struct DefaultSingletonTraits<OpenSSLKeyStoreAndroid>;
   OpenSSLKeyStoreAndroid() {}
-  friend struct DefaultSingletonTraits<OpenSSLKeyStoreAndroid>;
 
   DISALLOW_COPY_AND_ASSIGN(OpenSSLKeyStoreAndroid);
 };
 
 }  // namespace
 
 OpenSSLPrivateKeyStore* OpenSSLPrivateKeyStore::GetInstance() {
   return OpenSSLKeyStoreAndroid::GetInstance();
 }
 
 }  // namespace net