net: extract net/cert out of net/base

net/net.gyp

 # Copyright 2013 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.
 
 {
   'variables': {
     'chromium_code': 1,
 
     'linux_link_kerberos%': 0,
     'use_simple_cache_backend%': 0,
@@ skipping 65 matching lines @@
         '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',
         'android/network_library.h',
         'base/address_family.h',
         'base/address_list.cc',
         'base/address_list.h',
         'base/address_tracker_linux.cc',
         'base/address_tracker_linux.h',
-        'base/asn1_util.cc',
-        'base/asn1_util.h',
+        'cert/asn1_util.cc',
+        'cert/asn1_util.h',
         'base/auth.cc',
         'base/auth.h',
         'base/backoff_entry.cc',
         'base/backoff_entry.h',
         'base/bandwidth_metrics.cc',
         'base/bandwidth_metrics.h',
         'base/big_endian.cc',
         'base/big_endian.h',
         'base/cache_type.h',
-        'base/cert_database.cc',
-        'base/cert_database.h',
-        'base/cert_database_android.cc',
-        'base/cert_database_ios.cc',
-        'base/cert_database_mac.cc',
-        'base/cert_database_nss.cc',
-        'base/cert_database_openssl.cc',
-        'base/cert_database_win.cc',
-        'base/cert_status_flags.cc',
+        'cert/cert_database.cc',
+        'cert/cert_database.h',
+        'cert/cert_database_android.cc',
+        'cert/cert_database_ios.cc',
+        'cert/cert_database_mac.cc',
+        'cert/cert_database_nss.cc',
+        'cert/cert_database_openssl.cc',
+        'cert/cert_database_win.cc',
+        'cert/cert_status_flags.cc',
         'base/cert_status_flags.h',
-        'base/cert_trust_anchor_provider.h',
-        'base/cert_verifier.cc',
-        'base/cert_verifier.h',
-        'base/cert_verify_proc.cc',
-        'base/cert_verify_proc.h',
-        'base/cert_verify_proc_android.cc',
-        'base/cert_verify_proc_android.h',
-        'base/cert_verify_proc_mac.cc',
-        'base/cert_verify_proc_mac.h',
-        'base/cert_verify_proc_nss.cc',
-        'base/cert_verify_proc_nss.h',
-        'base/cert_verify_proc_openssl.cc',
-        'base/cert_verify_proc_openssl.h',
-        'base/cert_verify_proc_win.cc',
-        'base/cert_verify_proc_win.h',
-        'base/cert_verify_result.cc',
-        'base/cert_verify_result.h',
+        'cert/cert_trust_anchor_provider.h',
+        'cert/cert_verifier.cc',
+        'cert/cert_verifier.h',
+        'cert/cert_verify_proc.cc',
+        'cert/cert_verify_proc.h',
+        'cert/cert_verify_proc_android.cc',
+        'cert/cert_verify_proc_android.h',
+        'cert/cert_verify_proc_mac.cc',
+        'cert/cert_verify_proc_mac.h',
+        'cert/cert_verify_proc_nss.cc',
+        'cert/cert_verify_proc_nss.h',
+        'cert/cert_verify_proc_openssl.cc',
+        'cert/cert_verify_proc_openssl.h',
+        'cert/cert_verify_proc_win.cc',
+        'cert/cert_verify_proc_win.h',
+        'cert/cert_verify_result.cc',
+        'cert/cert_verify_result.h',
         'base/completion_callback.h',
         'base/connection_type_histograms.cc',
         'base/connection_type_histograms.h',
-        'base/crl_set.cc',
-        'base/crl_set.h',
+        'cert/crl_set.cc',
+        'cert/crl_set.h',

[Ryan Sleevi, 2013/03/27 17:21:25]

Please sort all modifications to this file.

[Paweł Hajdan Jr., 2013/03/28 00:25:35]

Done.

         'base/crypto_module.h',
         'base/crypto_module_nss.cc',
         'base/crypto_module_openssl.cc',
         'base/data_url.cc',
         'base/data_url.h',
         'base/directory_lister.cc',
         'base/directory_lister.h',
         'base/dns_reloader.cc',
         'base/dns_reloader.h',
         'base/dns_util.cc',
         'base/dns_util.h',
         'base/escape.cc',
         'base/escape.h',
-        'base/ev_root_ca_metadata.cc',
-        'base/ev_root_ca_metadata.h',
+        'cert/ev_root_ca_metadata.cc',
+        'cert/ev_root_ca_metadata.h',
         'base/expiring_cache.h',
         'base/file_stream.cc',
         'base/file_stream.h',
         'base/file_stream_context.cc',
         'base/file_stream_context.h',
         'base/file_stream_context_posix.cc',
         'base/file_stream_context_win.cc',
         'base/file_stream_metrics.cc',
         'base/file_stream_metrics.h',
         'base/file_stream_metrics_posix.cc',
@@ skipping 31 matching lines @@
         'base/load_flags.h',
         'base/load_flags_list.h',
         'base/load_states.h',
         'base/load_states_list.h',
         'base/load_timing_info.cc',
         'base/load_timing_info.h',
         'base/mime_sniffer.cc',
         'base/mime_sniffer.h',
         'base/mime_util.cc',
         'base/mime_util.h',
-        'base/multi_threaded_cert_verifier.cc',
-        'base/multi_threaded_cert_verifier.h',
+        'cert/multi_threaded_cert_verifier.cc',
+        'cert/multi_threaded_cert_verifier.h',
         'base/net_error_list.h',
         'base/net_errors.cc',
         'base/net_errors.h',
         'base/net_errors_posix.cc',
         'base/net_errors_win.cc',
         'base/net_export.h',
         'base/net_log.cc',
         'base/net_log.h',
         'base/net_log_event_type_list.h',
         'base/net_log_source_type_list.h',
         'base/net_module.cc',
         'base/net_module.h',
         'base/net_util.cc',
         'base/net_util.h',
         'base/net_util_posix.cc',
         'base/net_util_win.cc',
         'base/network_change_notifier.cc',
         'base/network_change_notifier.h',
         'base/network_change_notifier_factory.h',
         'base/network_change_notifier_linux.cc',
         'base/network_change_notifier_linux.h',
         'base/network_change_notifier_mac.cc',
         'base/network_change_notifier_mac.h',
         'base/network_change_notifier_win.cc',
         'base/network_change_notifier_win.h',
         'base/network_config_watcher_mac.cc',
         'base/network_config_watcher_mac.h',
         'base/network_delegate.cc',
         'base/network_delegate.h',
-        'base/nss_cert_database.cc',
-        'base/nss_cert_database.h',
+        'cert/nss_cert_database.cc',
+        'cert/nss_cert_database.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',
-        'base/pem_tokenizer.cc',
-        'base/pem_tokenizer.h',
+        'cert/pem_tokenizer.cc',
+        'cert/pem_tokenizer.h',
         'base/platform_mime_util.h',
         # TODO(tc): gnome-vfs? xdgmime? /etc/mime.types?
         'base/platform_mime_util_linux.cc',
         'base/platform_mime_util_mac.mm',
         'base/platform_mime_util_win.cc',
         'base/prioritized_dispatcher.cc',
         'base/prioritized_dispatcher.h',
         'base/priority_queue.h',
         'base/rand_callback.h',
         'base/registry_controlled_domains/registry_controlled_domain.cc',
         'base/registry_controlled_domains/registry_controlled_domain.h',
         'base/request_priority.h',
         'base/sdch_filter.cc',
         'base/sdch_filter.h',
         'base/sdch_manager.cc',
         'base/sdch_manager.h',
-        'base/single_request_cert_verifier.cc',
-        'base/single_request_cert_verifier.h',
+        'cert/single_request_cert_verifier.cc',
+        'cert/single_request_cert_verifier.h',
         'base/static_cookie_policy.cc',
         'base/static_cookie_policy.h',
         'base/stream_listen_socket.cc',
         'base/stream_listen_socket.h',
         'base/sys_addrinfo.h',
         'base/tcp_listen_socket.cc',
         'base/tcp_listen_socket.h',
         'base/test_data_stream.cc',
         'base/test_data_stream.h',
-        'base/test_root_certs.cc',
-        'base/test_root_certs.h',
-        'base/test_root_certs_mac.cc',
-        'base/test_root_certs_nss.cc',
-        'base/test_root_certs_openssl.cc',
-        'base/test_root_certs_android.cc',
-        'base/test_root_certs_win.cc',
+        'cert/test_root_certs.cc',
+        'cert/test_root_certs.h',
+        'cert/test_root_certs_mac.cc',
+        'cert/test_root_certs_nss.cc',
+        'cert/test_root_certs_openssl.cc',
+        'cert/test_root_certs_android.cc',
+        'cert/test_root_certs_win.cc',
         'base/unix_domain_socket_posix.cc',
         'base/unix_domain_socket_posix.h',
         'base/upload_bytes_element_reader.cc',
         'base/upload_bytes_element_reader.h',
         'base/upload_data.cc',
         'base/upload_data.h',
         'base/upload_data_stream.cc',
         'base/upload_data_stream.h',
         'base/upload_element.cc',
         'base/upload_element.h',
         'base/upload_element_reader.cc',
         'base/upload_element_reader.h',
         'base/upload_file_element_reader.cc',
         'base/upload_file_element_reader.h',
         'base/upload_progress.h',
         'base/url_util.cc',
         'base/url_util.h',
         'base/winsock_init.cc',
         'base/winsock_init.h',
         'base/winsock_util.cc',
         'base/winsock_util.h',
-        'base/x509_cert_types.cc',
-        'base/x509_cert_types.h',
-        'base/x509_cert_types_mac.cc',
-        'base/x509_cert_types_win.cc',
-        'base/x509_certificate.cc',
-        'base/x509_certificate.h',
-        'base/x509_certificate_ios.cc',
-        'base/x509_certificate_mac.cc',
-        'base/x509_certificate_net_log_param.cc',
-        'base/x509_certificate_net_log_param.h',
-        'base/x509_certificate_nss.cc',
-        'base/x509_certificate_openssl.cc',
-        'base/x509_certificate_win.cc',
-        'base/x509_util.h',
-        'base/x509_util.cc',
-        'base/x509_util_ios.cc',
-        'base/x509_util_ios.h',
-        'base/x509_util_mac.cc',
-        'base/x509_util_mac.h',
-        'base/x509_util_nss.cc',
-        'base/x509_util_nss.h',
-        'base/x509_util_openssl.cc',
-        'base/x509_util_openssl.h',
+        'cert/x509_cert_types.cc',
+        'cert/x509_cert_types.h',
+        'cert/x509_cert_types_mac.cc',
+        'cert/x509_cert_types_win.cc',
+        'cert/x509_certificate.cc',
+        'cert/x509_certificate.h',
+        'cert/x509_certificate_ios.cc',
+        'cert/x509_certificate_mac.cc',
+        'cert/x509_certificate_net_log_param.cc',
+        'cert/x509_certificate_net_log_param.h',
+        'cert/x509_certificate_nss.cc',
+        'cert/x509_certificate_openssl.cc',
+        'cert/x509_certificate_win.cc',
+        'cert/x509_util.h',
+        'cert/x509_util.cc',
+        'cert/x509_util_ios.cc',
+        'cert/x509_util_ios.h',
+        'cert/x509_util_mac.cc',
+        'cert/x509_util_mac.h',
+        'cert/x509_util_nss.cc',
+        'cert/x509_util_nss.h',
+        'cert/x509_util_openssl.cc',
+        'cert/x509_util_openssl.h',
         'base/zap.cc',
         'base/zap.h',
         'cookies/canonical_cookie.cc',
         'cookies/canonical_cookie.h',
         'cookies/cookie_monster.cc',
         'cookies/cookie_monster.h',
         'cookies/cookie_options.h',
         'cookies/cookie_store.cc',
         'cookies/cookie_store.h',
         'cookies/cookie_util.cc',
@@ skipping 754 matching lines @@
             'dns/dns_client.cc',
           ],
         }],
         ['use_simple_cache_backend==1', {
           'defines': [
             'USE_SIMPLE_CACHE_BACKEND',
           ]
         }],
         ['use_openssl==1', {
             'sources!': [
-              'base/cert_database_nss.cc',
-              'base/cert_verify_proc_nss.cc',
-              'base/cert_verify_proc_nss.h',
+              'cert/cert_database_nss.cc',
+              'cert/cert_verify_proc_nss.cc',
+              'cert/cert_verify_proc_nss.h',
               'base/crypto_module_nss.cc',
               'base/keygen_handler_nss.cc',
-              'base/nss_cert_database.cc',
-              'base/nss_cert_database.h',
+              'cert/nss_cert_database.cc',
+              'cert/nss_cert_database.h',
               'base/nss_memio.c',
               'base/nss_memio.h',
-              'base/test_root_certs_nss.cc',
-              'base/x509_certificate_nss.cc',
-              'base/x509_util_nss.cc',
-              'base/x509_util_nss.h',
+              'cert/test_root_certs_nss.cc',
+              'cert/x509_certificate_nss.cc',
+              'cert/x509_util_nss.cc',
+              'cert/x509_util_nss.h',
               'ocsp/nss_ocsp.cc',
               'ocsp/nss_ocsp.h',
               'quic/crypto/aes_128_gcm_decrypter_nss.cc',
               'quic/crypto/aes_128_gcm_encrypter_nss.cc',
               'quic/crypto/p256_key_exchange_nss.cc',
               'socket/nss_ssl_util.cc',
               'socket/nss_ssl_util.h',
               'socket/ssl_client_socket_nss.cc',
               'socket/ssl_client_socket_nss.h',
               'socket/ssl_server_socket_nss.cc',
               'socket/ssl_server_socket_nss.h',
               'ssl/client_cert_store_impl_nss.cc',
               'third_party/mozilla_security_manager/nsKeygenHandler.cpp',
               'third_party/mozilla_security_manager/nsKeygenHandler.h',
               'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp',
               'third_party/mozilla_security_manager/nsNSSCertificateDB.h',
               'third_party/mozilla_security_manager/nsPKCS12Blob.cpp',
               'third_party/mozilla_security_manager/nsPKCS12Blob.h',
             ],
           },
           {  # else !use_openssl: remove the unneeded files
             'sources!': [
-              'base/cert_database_openssl.cc',
-              'base/cert_verify_proc_openssl.cc',
-              'base/cert_verify_proc_openssl.h',
+              'cert/cert_database_openssl.cc',
+              'cert/cert_verify_proc_openssl.cc',
+              'cert/cert_verify_proc_openssl.h',
               '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',
-              'base/test_root_certs_openssl.cc',
-              'base/x509_certificate_openssl.cc',
-              'base/x509_util_openssl.cc',
-              'base/x509_util_openssl.h',
+              'cert/test_root_certs_openssl.cc',
+              'cert/x509_certificate_openssl.cc',
+              'cert/x509_util_openssl.cc',
+              'cert/x509_util_openssl.h',
               'quic/crypto/aes_128_gcm_decrypter_openssl.cc',
               'quic/crypto/aes_128_gcm_encrypter_openssl.cc',
               'quic/crypto/p256_key_exchange_openssl.cc',
               'quic/crypto/scoped_evp_cipher_ctx.h',
               'socket/ssl_client_socket_openssl.cc',
               'socket/ssl_client_socket_openssl.h',
               'socket/ssl_server_socket_openssl.cc',
             ],
           },
         ],
@@ skipping 28 matching lines @@
                 'link_settings': {
                   'ldflags': [
                     '-R/usr/lib/mps',
                   ],
                 },
               }],
             ],
           },
           {  # else: OS is not in the above list
             'sources!': [
-              'base/cert_database_nss.cc',
+              'cert/cert_database_nss.cc',
               'base/crypto_module_nss.cc',
               'base/keygen_handler_nss.cc',
-              'base/nss_cert_database.cc',
-              'base/nss_cert_database.h',
-              'base/test_root_certs_nss.cc',
-              'base/x509_certificate_nss.cc',
+              'cert/nss_cert_database.cc',
+              'cert/nss_cert_database.h',
+              'cert/test_root_certs_nss.cc',
+              'cert/x509_certificate_nss.cc',
               'ocsp/nss_ocsp.cc',
               'ocsp/nss_ocsp.h',
               'third_party/mozilla_security_manager/nsKeygenHandler.cpp',
               'third_party/mozilla_security_manager/nsKeygenHandler.h',
               'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp',
               'third_party/mozilla_security_manager/nsNSSCertificateDB.h',
               'third_party/mozilla_security_manager/nsPKCS12Blob.cpp',
               'third_party/mozilla_security_manager/nsPKCS12Blob.h',
             ],
           },
         ],
         [ 'toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:gdk',
           ],
         }],
         [ 'use_nss != 1', {
             'sources!': [
-              'base/cert_verify_proc_nss.cc',
-              'base/cert_verify_proc_nss.h',
+              'cert/cert_verify_proc_nss.cc',
+              'cert/cert_verify_proc_nss.h',
               'ssl/client_cert_store_impl_nss.cc',
             ],
         }],
         [ 'enable_websockets != 1', {
             'sources/': [
               ['exclude', '^socket_stream/'],
               ['exclude', '^websockets/'],
             ],
             'sources!': [
               'spdy/spdy_websocket_stream.cc',
@@ skipping 69 matching lines @@
           'dependencies': [
              'net_java',
           ],
         }],
         [ 'OS == "android"', {
             'dependencies': [
               '../third_party/openssl/openssl.gyp:openssl',
               'net_jni_headers',
             ],
             'sources!': [
-              'base/cert_database_openssl.cc',
-              'base/cert_verify_proc_openssl.cc',
+              'cert/cert_database_openssl.cc',
+              'cert/cert_verify_proc_openssl.cc',
               'base/openssl_private_key_store_memory.cc',
-              'base/test_root_certs_openssl.cc',
+              'cert/test_root_certs_openssl.cc',
             ],
             # The net/android/keystore_openssl.cc source file needs to
             # access an OpenSSL-internal header.
             'include_dirs': [
               '../third_party/openssl',
             ],
           }, {  # else OS != "android"
             'defines': [
               # These are the features Android doesn't support.
               'ENABLE_MEDIA_CODEC_THEORA',
@@ skipping 55 matching lines @@
         'net',
         'net_test_support',
       ],
       'sources': [
         'android/keystore_unittest.cc',
         'android/network_change_notifier_android_unittest.cc',
         'base/address_list_unittest.cc',
         'base/address_tracker_linux_unittest.cc',
         'base/backoff_entry_unittest.cc',
         'base/big_endian_unittest.cc',
-        'base/cert_verify_proc_unittest.cc',
-        'base/crl_set_unittest.cc',
+        'cert/cert_verify_proc_unittest.cc',
+        'cert/crl_set_unittest.cc',
         'base/data_url_unittest.cc',
         'base/directory_lister_unittest.cc',
         'base/dns_util_unittest.cc',
         'base/escape_unittest.cc',
-        'base/ev_root_ca_metadata_unittest.cc',
+        'cert/ev_root_ca_metadata_unittest.cc',
         'base/expiring_cache_unittest.cc',
         'base/file_stream_unittest.cc',
         'base/filter_unittest.cc',
         'base/int128_unittest.cc',
         'base/gzip_filter_unittest.cc',
         'base/host_cache_unittest.cc',
         'base/host_mapping_rules_unittest.cc',
         'base/host_port_pair_unittest.cc',
         'base/ip_endpoint_unittest.cc',
         'base/keygen_handler_unittest.cc',
         'base/mime_sniffer_unittest.cc',
         'base/mime_util_unittest.cc',
         'base/mock_filter_context.cc',
         'base/mock_filter_context.h',
-        'base/multi_threaded_cert_verifier_unittest.cc',
+        'cert/multi_threaded_cert_verifier_unittest.cc',
         'base/net_log_unittest.h',
         'base/net_util_unittest.cc',
         'base/network_change_notifier_win_unittest.cc',
-        'base/nss_cert_database_unittest.cc',
+        'cert/nss_cert_database_unittest.cc',
         'base/openssl_client_key_store_unittest.cc',
-        'base/pem_tokenizer_unittest.cc',
+        'cert/pem_tokenizer_unittest.cc',
         'base/prioritized_dispatcher_unittest.cc',
         'base/priority_queue_unittest.cc',
         'base/registry_controlled_domains/registry_controlled_domain_unittest.cc',
         'base/sdch_filter_unittest.cc',
         'base/static_cookie_policy_unittest.cc',
         'base/tcp_listen_socket_unittest.cc',
         'base/tcp_listen_socket_unittest.h',
-        'base/test_certificate_data.h',
+        'cert/test_certificate_data.h',
         'base/test_completion_callback_unittest.cc',
         'base/unix_domain_socket_posix_unittest.cc',
         'base/upload_bytes_element_reader_unittest.cc',
         'base/upload_data_stream_unittest.cc',
         'base/upload_file_element_reader_unittest.cc',
         'base/url_util_unittest.cc',
-        'base/x509_certificate_unittest.cc',
-        'base/x509_cert_types_unittest.cc',
-        'base/x509_util_unittest.cc',
-        'base/x509_util_nss_unittest.cc',
-        'base/x509_util_openssl_unittest.cc',
+        'cert/x509_certificate_unittest.cc',
+        'cert/x509_cert_types_unittest.cc',
+        'cert/x509_util_unittest.cc',
+        'cert/x509_util_nss_unittest.cc',
+        'cert/x509_util_openssl_unittest.cc',
         'cookies/canonical_cookie_unittest.cc',
         'cookies/cookie_monster_unittest.cc',
         'cookies/cookie_store_unittest.h',
         'cookies/cookie_util_unittest.cc',
         'cookies/parsed_cookie_unittest.cc',
         'disk_cache/addr_unittest.cc',
         'disk_cache/backend_unittest.cc',
         'disk_cache/bitmap_unittest.cc',
         'disk_cache/block_files_unittest.cc',
         'disk_cache/cache_util_unittest.cc',
@@ skipping 278 matching lines @@
             'net_javatests',
             'net_test_jni_headers',
           ],
         }],
         [ 'use_glib == 1', {
             'dependencies': [
               '../build/linux/system.gyp:ssl',
             ],
           }, {  # else use_glib == 0: !posix || mac
             'sources!': [
-              'base/nss_cert_database_unittest.cc',
+              'cert/nss_cert_database_unittest.cc',
             ],
           },
         ],
         [ 'toolkit_uses_gtk == 1', {
             'dependencies': [
               '../build/linux/system.gyp:gtk',
             ],
           },
         ],
         [ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', {
@@ skipping 15 matching lines @@
             'http/http_auth_handler_negotiate_unittest.cc',
             'http/mock_gssapi_library_posix.cc',
             'http/mock_gssapi_library_posix.h',
           ],
         }],
         [ 'use_openssl==1', {
             # When building for OpenSSL, we need to exclude NSS specific tests.
             # TODO(bulach): Add equivalent tests when the underlying
             #               functionality is ported to OpenSSL.
             'sources!': [
-              'base/nss_cert_database_unittest.cc',
-              'base/x509_util_nss_unittest.cc',
+              'cert/nss_cert_database_unittest.cc',
+              'cert/x509_util_nss_unittest.cc',
               'ssl/client_cert_store_impl_unittest.cc',
             ],
           }, {  # else !use_openssl: remove the unneeded files
             'sources!': [
               'base/openssl_client_key_store_unittest.cc',
-              'base/x509_util_openssl_unittest.cc',
+              'cert/x509_util_openssl_unittest.cc',
               'socket/ssl_client_socket_openssl_unittest.cc',
             ],
           },
         ],
         [ 'enable_websockets != 1', {
             'sources/': [
               ['exclude', '^socket_stream/'],
               ['exclude', '^websockets/'],
               ['exclude', '^spdy/spdy_websocket_stream_spdy._unittest\\.cc$'],
             ],
@@ skipping 135 matching lines @@
             ],
           },
         ],
         ['OS == "android" and gtest_target_type == "shared_library"', {
           'dependencies': [
             '../testing/android/native_test.gyp:native_test_native_code',
           ]
         }],
         [ 'OS != "win" and OS != "mac"', {
           'sources!': [
-            'base/x509_cert_types_unittest.cc',
+            'cert/x509_cert_types_unittest.cc',
           ],
         }],
       ],
     },
     {
       'target_name': 'net_perftests',
       'type': 'executable',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
@@ skipping 42 matching lines @@
         'net',
       ],
       'export_dependent_settings': [
         '../base/base.gyp:base',
         '../base/base.gyp:test_support_base',
         '../testing/gtest.gyp:gtest',
       ],
       'sources': [
         'base/capturing_net_log.cc',
         'base/capturing_net_log.h',
-        'base/cert_test_util.cc',
-        'base/cert_test_util.h',
+        'test/cert_test_util.cc',
+        'test/cert_test_util.h',
         'base/load_timing_info_test_util.cc',
         'base/load_timing_info_test_util.h',
-        'base/mock_cert_verifier.cc',
-        'base/mock_cert_verifier.h',
+        'cert/mock_cert_verifier.cc',
+        'cert/mock_cert_verifier.h',
         'base/mock_file_stream.cc',
         'base/mock_file_stream.h',
         'base/test_completion_callback.cc',
         'base/test_completion_callback.h',
         'base/test_data_directory.cc',
         'base/test_data_directory.h',
         'cookies/cookie_monster_store_test.cc',
         'cookies/cookie_monster_store_test.h',
         'cookies/cookie_store_test_callbacks.cc',
         'cookies/cookie_store_test_callbacks.h',
@@ skipping 604 matching lines @@
                 '--result', '<@(_outputs)',
                 '--isolate', 'net_unittests.isolate',
               ],
             },
           ],
         },
       ],
     }],
   ],
 }