net: move openssl and keygen from net/base to net/cert

net/net.gyp

Index: net/net.gyp
diff --git a/net/net.gyp b/net/net.gyp
index 94c9e3cc6a3c418023cdf4aaf1e4a5d8bf855570..980ce70cd1795ca59197a0123fbc16f358b24d96 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -190,8 +190,6 @@
         'base/network_delegate.h',
         'base/nss_memio.c',
         'base/nss_memio.h',
-        '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',
@@ -867,6 +865,8 @@
         'ssl/client_cert_store_impl_win.cc',
         'ssl/default_server_bound_cert_store.cc',
         'ssl/default_server_bound_cert_store.h',
+        'ssl/openssl_client_key_store.cc',
+        'ssl/openssl_client_key_store.h',
         'ssl/server_bound_cert_service.cc',
         'ssl/server_bound_cert_service.h',
         'ssl/server_bound_cert_store.cc',
@@ -1126,8 +1126,6 @@
             'sources!': [
               'base/crypto_module_openssl.cc',
               'base/keygen_handler_openssl.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',
@@ -1145,6 +1143,8 @@
               'socket/ssl_client_socket_openssl.cc',
               'socket/ssl_client_socket_openssl.h',
               'socket/ssl_server_socket_openssl.cc',
+              'ssl/openssl_client_key_store.cc',
+              'ssl/openssl_client_key_store.h',
             ],
           },
         ],
@@ -1402,7 +1402,6 @@
         'base/net_log_unittest.h',
         'base/net_util_unittest.cc',
         'base/network_change_notifier_win_unittest.cc',
-        'base/openssl_client_key_store_unittest.cc',
         'base/prioritized_dispatcher_unittest.cc',
         'base/priority_queue_unittest.cc',
         'base/registry_controlled_domains/registry_controlled_domain_unittest.cc',
@@ -1663,6 +1662,7 @@
         'spdy/spdy_websocket_test_util_spdy3.h',
         'ssl/client_cert_store_impl_unittest.cc',
         'ssl/default_server_bound_cert_store_unittest.cc',
+        'ssl/openssl_client_key_store_unittest.cc',
         'ssl/server_bound_cert_service_unittest.cc',
         'ssl/ssl_cipher_suite_names_unittest.cc',
         'ssl/ssl_client_auth_cache_unittest.cc',
@@ -1768,9 +1768,9 @@
             ],
           }, {  # else !use_openssl: remove the unneeded files
             'sources!': [
-              'base/openssl_client_key_store_unittest.cc',
               'cert/x509_util_openssl_unittest.cc',
               'socket/ssl_client_socket_openssl_unittest.cc',
+              'ssl/openssl_client_key_store_unittest.cc',
             ],
           },
         ],