Remove ENGINE indirection from Android SSLPrivateKey.

net/net.gypi

 # Copyright 2014 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.
 
 # This file is shared between the regular GYP build, the NaCl GYP build, and
 # the GN build. For GN support, it must have no conditionals or anything like
 # that beyond the simple one-level-deep dictionary of values.
 {
   'variables': {
     # Subset of net source files that are compiled for NaCl (net_nacl target).
@@ skipping 227 matching lines @@
       'android/cellular_signal_strength.cc',
       'android/cellular_signal_strength.h',
       'android/cert_verify_result_android.cc',
       'android/cert_verify_result_android.h',
       'android/gurl_utils.cc',
       'android/gurl_utils.h',
       'android/http_auth_negotiate_android.cc',
       'android/http_auth_negotiate_android.h',
       'android/keystore.cc',
       'android/keystore.h',
-      'android/keystore_openssl.cc',
-      'android/keystore_openssl.h',
       'android/legacy_openssl.h',
       'android/net_jni_registrar.cc',
       'android/net_jni_registrar.h',
       'android/network_change_notifier_android.cc',
       'android/network_change_notifier_android.h',
       'android/network_change_notifier_delegate_android.cc',
       'android/network_change_notifier_delegate_android.h',
       'android/network_change_notifier_factory_android.cc',
       'android/network_change_notifier_factory_android.h',
       'android/network_library.cc',
@@ skipping 1074 matching lines @@
       'extras/sqlite/sqlite_channel_id_store.cc',
       'extras/sqlite/sqlite_channel_id_store.h',
       'extras/sqlite/sqlite_persistent_cookie_store.cc',
       'extras/sqlite/sqlite_persistent_cookie_store.h',
     ],
     'net_test_sources': [
       'android/cellular_signal_strength_unittest.cc',
       'android/dummy_spnego_authenticator.cc',
       'android/dummy_spnego_authenticator.h',
       'android/http_auth_negotiate_android_unittest.cc',
-      'android/keystore_unittest.cc',
       'android/network_change_notifier_android_unittest.cc',
       'android/traffic_stats_unittest.cc',
       'base/address_family_unittest.cc',
       'base/address_list_unittest.cc',
       'base/address_tracker_linux_unittest.cc',
       'base/arena_unittest.cc',
       'base/backoff_entry_serializer_unittest.cc',
       'base/backoff_entry_unittest.cc',
       'base/chunked_upload_data_stream_unittest.cc',
       'base/data_url_unittest.cc',
@@ skipping 485 matching lines @@
       'ssl/client_cert_store_unittest-inl.h',
       'ssl/client_cert_store_win_unittest.cc',
       'ssl/default_channel_id_store_unittest.cc',
       'ssl/openssl_client_key_store_unittest.cc',
       'ssl/ssl_cipher_suite_names_unittest.cc',
       'ssl/ssl_client_auth_cache_unittest.cc',
       'ssl/ssl_client_session_cache_unittest.cc',
       'ssl/ssl_config_service_unittest.cc',
       'ssl/ssl_config_unittest.cc',
       'ssl/ssl_connection_status_flags_unittest.cc',
+      'ssl/ssl_platform_key_android_unittest.cc',
       'test/embedded_test_server/embedded_test_server_unittest.cc',
       'test/embedded_test_server/http_request_unittest.cc',
       'test/embedded_test_server/http_response_unittest.cc',
       'test/python_utils_unittest.cc',
       'test/run_all_unittests.cc',
       'third_party/nist-pkits/pkits_testcases-inl.h',
       'tools/balsa/balsa_frame_test.cc',
       'tools/balsa/balsa_headers_test.cc',
       'tools/quic/quic_simple_client_test.cc',
       'tools/quic/test_tools/mock_quic_server_session_visitor.cc',
@@ skipping 1344 matching lines @@
       'third_party/nist-pkits/crls/requireExplicitPolicy5subCACRL.crl',
       'third_party/nist-pkits/crls/requireExplicitPolicy5subsubCACRL.crl',
       'third_party/nist-pkits/crls/requireExplicitPolicy5subsubsubCACRL.crl',
       'third_party/nist-pkits/crls/requireExplicitPolicy7CACRL.crl',
       'third_party/nist-pkits/crls/requireExplicitPolicy7subCARE2CRL.crl',
       'third_party/nist-pkits/crls/requireExplicitPolicy7subsubCARE2RE4CRL.crl',
       'third_party/nist-pkits/crls/requireExplicitPolicy7subsubsubCARE2RE4CRL.crl',
     ],
   }
 }