Wire up SSL client authentication for OpenSSL/Android through the net/ stack

net/net.gyp

Index: net/net.gyp
diff --git a/net/net.gyp b/net/net.gyp
index 33c0383de11ab3eb4f6d7aa19b19dc7d3443d40c..911041505bad91176317f36edf2a01cb9440561d 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -241,9 +241,11 @@
         'base/nss_cert_database.h',
         'base/nss_memio.c',
         'base/nss_memio.h',
-        'base/openssl_memory_private_key_store.cc',
+        'base/openssl_client_key_store.cc',
+        'base/openssl_client_key_store.h',
         'base/openssl_private_key_store.h',
         'base/openssl_private_key_store_android.cc',
+        'base/openssl_private_key_store_memory.cc',
         'base/pem_tokenizer.cc',
         'base/pem_tokenizer.h',
         'base/platform_mime_util.h',
@@ -1100,9 +1102,11 @@
               'base/cert_verify_proc_openssl.h',
               'base/crypto_module_openssl.cc',
               'base/keygen_handler_openssl.cc',
-              'base/openssl_memory_private_key_store.cc',
+              'base/openssl_client_key_store.cc',
+              'base/openssl_client_key_store.h',
               'base/openssl_private_key_store.h',
               'base/openssl_private_key_store_android.cc',
+              'base/openssl_private_key_store_memory.cc',
               'base/test_root_certs_openssl.cc',
               'base/x509_certificate_openssl.cc',
               'base/x509_util_openssl.cc',
@@ -1269,7 +1273,7 @@
             'sources!': [
               'base/cert_database_openssl.cc',
               'base/cert_verify_proc_openssl.cc',
-              'base/openssl_memory_private_key_store.cc',
+              'base/openssl_private_key_store_memory.cc',
               'base/test_root_certs_openssl.cc',
             ],
             # The net/android/keystore_openssl.cc source file needs to
@@ -1376,6 +1380,7 @@
         'base/net_util_unittest.cc',
         'base/network_change_notifier_win_unittest.cc',
         'base/nss_cert_database_unittest.cc',
+        'base/openssl_client_key_store_unittest.cc',
         'base/pem_tokenizer_unittest.cc',
         'base/prioritized_dispatcher_unittest.cc',
         'base/priority_queue_unittest.cc',
@@ -1568,6 +1573,7 @@
         'socket/socks5_client_socket_unittest.cc',
         'socket/socks_client_socket_pool_unittest.cc',
         'socket/socks_client_socket_unittest.cc',
+        'socket/ssl_client_socket_openssl_unittest.cc',
         'socket/ssl_client_socket_pool_unittest.cc',
         'socket/ssl_client_socket_unittest.cc',
         'socket/ssl_server_socket_unittest.cc',
@@ -1713,7 +1719,9 @@
             ],
           }, {  # else !use_openssl: remove the unneeded files
             'sources!': [
+              'base/openssl_client_key_store_unittest.cc',
               'base/x509_util_openssl_unittest.cc',
+              'socket/ssl_client_socket_openssl_unittest.cc',
             ],
           },
         ],