net: split net/ssl 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 103 matching lines @@
         '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',
         'base/client_cert_store.h',
-        'base/client_cert_store_impl.h',
-        'base/client_cert_store_impl_mac.cc',
-        'base/client_cert_store_impl_nss.cc',
-        'base/client_cert_store_impl_win.cc',
+        'ssl/client_cert_store_impl.h',
+        'ssl/client_cert_store_impl_mac.cc',
+        'ssl/client_cert_store_impl_nss.cc',
+        'ssl/client_cert_store_impl_win.cc',

[wtc, 2013/03/12 23:14:37]

Are you planning to sort these files in a separate CL?

[Paweł Hajdan Jr., 2013/03/13 22:59:52]

Done.

         'base/completion_callback.h',
         'base/connection_type_histograms.cc',
         'base/connection_type_histograms.h',
         'base/crl_set.cc',
         'base/crl_set.h',
         'base/crypto_module.h',
         'base/crypto_module_nss.cc',
         'base/crypto_module_openssl.cc',
         'base/data_url.cc',
         'base/data_url.h',
-        'base/default_server_bound_cert_store.cc',
-        'base/default_server_bound_cert_store.h',
+        'ssl/default_server_bound_cert_store.cc',
+        'ssl/default_server_bound_cert_store.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',
@@ skipping 107 matching lines @@
         '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/server_bound_cert_service.cc',
-        'base/server_bound_cert_service.h',
-        'base/server_bound_cert_store.cc',
-        'base/server_bound_cert_store.h',
+        'ssl/server_bound_cert_service.cc',
+        'ssl/server_bound_cert_service.h',
+        'ssl/server_bound_cert_store.cc',
+        'ssl/server_bound_cert_store.h',
         'base/single_request_cert_verifier.cc',
         'base/single_request_cert_verifier.h',
         'base/single_request_host_resolver.cc',
         'base/single_request_host_resolver.h',
-        'base/ssl_cert_request_info.cc',
-        'base/ssl_cert_request_info.h',
-        'base/ssl_cipher_suite_names.cc',
-        'base/ssl_cipher_suite_names.h',
-        'base/ssl_client_auth_cache.cc',
-        'base/ssl_client_auth_cache.h',
-        'base/ssl_client_cert_type.h',
-        'base/ssl_config_service.cc',
-        'base/ssl_config_service.h',
-        'base/ssl_config_service_defaults.cc',
-        'base/ssl_config_service_defaults.h',
-        'base/ssl_info.cc',
-        'base/ssl_info.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',
-        'base/transport_security_state.cc',
-        'base/transport_security_state.h',
-        'base/transport_security_state_static.h',
+        'ssl/transport_security_state.cc',
+        'ssl/transport_security_state.h',
+        'ssl/transport_security_state_static.h',
         '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',
@@ skipping 544 matching lines @@
         'spdy/spdy_proxy_client_socket.cc',
         'spdy/spdy_proxy_client_socket.h',
         'spdy/spdy_session.cc',
         'spdy/spdy_session.h',
         'spdy/spdy_session_pool.cc',
         'spdy/spdy_session_pool.h',
         'spdy/spdy_stream.cc',
         'spdy/spdy_stream.h',
         'spdy/spdy_websocket_stream.cc',
         'spdy/spdy_websocket_stream.h',
+        'ssl/ssl_cert_request_info.cc',
+        'ssl/ssl_cert_request_info.h',
+        'ssl/ssl_cipher_suite_names.cc',
+        'ssl/ssl_cipher_suite_names.h',
+        'ssl/ssl_client_auth_cache.cc',
+        'ssl/ssl_client_auth_cache.h',
+        'ssl/ssl_client_cert_type.h',
+        'ssl/ssl_config_service.cc',
+        'ssl/ssl_config_service.h',
+        'ssl/ssl_config_service_defaults.cc',
+        'ssl/ssl_config_service_defaults.h',
+        'ssl/ssl_info.cc',
+        'ssl/ssl_info.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',
         'udp/datagram_client_socket.h',
         'udp/datagram_server_socket.h',
         'udp/datagram_socket.h',
         'udp/udp_client_socket.cc',
@@ skipping 188 matching lines @@
         ['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',
-              'base/client_cert_store_impl_nss.cc',
+              'ssl/client_cert_store_impl_nss.cc',
               'base/crypto_module_nss.cc',
               'base/keygen_handler_nss.cc',
               'base/nss_cert_database.cc',
               'base/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',
@@ skipping 94 matching lines @@
         ],
         [ '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',
-              'base/client_cert_store_impl_nss.cc',
+              'ssl/client_cert_store_impl_nss.cc',
             ],
         }],
         [ 'enable_websockets != 1', {
             'sources/': [
               ['exclude', '^socket_stream/'],
               ['exclude', '^websockets/'],
             ],
             'sources!': [
               'spdy/spdy_websocket_stream.cc',
               'spdy/spdy_websocket_stream.h',
             ],
         }],
         [ 'OS == "win"', {
             'sources!': [
-              'base/client_cert_store_impl_nss.cc',
+              'ssl/client_cert_store_impl_nss.cc',
               'http/http_auth_handler_ntlm_portable.cc',
               'socket/tcp_client_socket_libevent.cc',
               'socket/tcp_client_socket_libevent.h',
               'socket/tcp_server_socket_libevent.cc',
               'socket/tcp_server_socket_libevent.h',
               'udp/udp_socket_libevent.cc',
               'udp/udp_socket_libevent.h',
             ],
             'dependencies': [
               '../third_party/nss/nss.gyp:nspr',
               '../third_party/nss/nss.gyp:nss',
               'third_party/nss/ssl.gyp:libssl',
               'tld_cleanup',
             ],
             # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
             'msvs_disabled_warnings': [4267, ],
           }, { # else: OS != "win"
             'sources!': [
               'base/winsock_init.cc',
               'base/winsock_init.h',
               'base/winsock_util.cc',
               'base/winsock_util.h',
               'proxy/proxy_resolver_winhttp.cc',
               'proxy/proxy_resolver_winhttp.h',
             ],
           },
         ],
         [ 'OS == "mac"', {
             'sources!': [
-              'base/client_cert_store_impl_nss.cc',
+              'ssl/client_cert_store_impl_nss.cc',
             ],
             'dependencies': [
               '../third_party/nss/nss.gyp:nspr',
               '../third_party/nss/nss.gyp:nss',
               'third_party/nss/ssl.gyp:libssl',
             ],
             'link_settings': {
               'libraries': [
                 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
                 '$(SDKROOT)/System/Library/Frameworks/Security.framework',
@@ skipping 103 matching lines @@
         '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/client_cert_store_impl_unittest.cc',
+        'ssl/client_cert_store_impl_unittest.cc',
         'base/crl_set_unittest.cc',
         'base/data_url_unittest.cc',
-        'base/default_server_bound_cert_store_unittest.cc',
+        'ssl/default_server_bound_cert_store_unittest.cc',
         'base/directory_lister_unittest.cc',
         'base/dns_util_unittest.cc',
         'base/escape_unittest.cc',
         'base/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',
@@ skipping 12 matching lines @@
         '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',
         'base/registry_controlled_domains/registry_controlled_domain_unittest.cc',
         'base/run_all_unittests.cc',
         'base/sdch_filter_unittest.cc',
-        'base/server_bound_cert_service_unittest.cc',
+        'ssl/server_bound_cert_service_unittest.cc',
         'base/single_request_host_resolver_unittest.cc',
-        'base/ssl_cipher_suite_names_unittest.cc',
-        'base/ssl_client_auth_cache_unittest.cc',
-        'base/ssl_config_service_unittest.cc',
+        'ssl/ssl_cipher_suite_names_unittest.cc',
+        'ssl/ssl_client_auth_cache_unittest.cc',
+        'ssl/ssl_config_service_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',
         'base/test_completion_callback_unittest.cc',
-        'base/transport_security_state_unittest.cc',
+        'ssl/transport_security_state_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',
@@ skipping 252 matching lines @@
           'sources!': [
             'base/network_change_notifier_linux_unittest.cc',
             'proxy/proxy_config_service_linux_unittest.cc',
           ],
         }],
         [ 'OS == "android"', {
           'sources!': [
             # No res_ninit() et al on Android, so this doesn't make a lot of
             # sense.
             'dns/dns_config_service_posix_unittest.cc',
-            'base/client_cert_store_impl_unittest.cc',
+            'ssl/client_cert_store_impl_unittest.cc',
           ],
           'dependencies': [
             'net_javatests',
             'net_test_jni_headers',
           ],
         }],
         [ 'use_glib == 1', {
             'dependencies': [
               '../build/linux/system.gyp:ssl',
             ],
@@ skipping 28 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/client_cert_store_impl_unittest.cc',
+              'ssl/client_cert_store_impl_unittest.cc',
               'base/nss_cert_database_unittest.cc',
               'base/x509_util_nss_unittest.cc',
             ],
           }, {  # 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',
             ],
           },
@@ skipping 70 matching lines @@
                     'data/url_request_unittest/',
                   ],
                   'test_data_prefix': 'net',
                 },
                 'includes': [ '../build/copy_test_data_ios.gypi' ],
               },
             ],
             'sources!': [
               # TODO(droger): The following tests are disabled because the
               # implementation is missing or incomplete.
-              'base/client_cert_store_impl_unittest.cc',
+              'ssl/client_cert_store_impl_unittest.cc',
               # KeygenHandler::GenKeyAndSignChallenge() is not ported to iOS.
               'base/keygen_handler_unittest.cc',
               # Need to read input data files.
               'base/gzip_filter_unittest.cc',
               'disk_cache/backend_unittest.cc',
               'disk_cache/block_files_unittest.cc',
               'socket/ssl_server_socket_unittest.cc',
               # Need TestServer.
               'proxy/proxy_script_fetcher_impl_unittest.cc',
               'socket/ssl_client_socket_unittest.cc',
               'url_request/url_fetcher_impl_unittest.cc',
               'url_request/url_request_context_builder_unittest.cc',
               # Needs GetAppOutput().
               'test/python_utils_unittest.cc',
 
               # The following tests are disabled because they don't apply to
               # iOS.
               # OS is not "linux" or "freebsd" or "openbsd".
               'base/unix_domain_socket_posix_unittest.cc',
             ],
             'conditions': [
               ['coverage != 0', {
                 'sources!': [
                   # These sources can't be built with coverage due to a
                   # toolchain bug: http://openradar.appspot.com/radar?id=1499403
-                  'base/transport_security_state_unittest.cc',
+                  'ssl/transport_security_state_unittest.cc',
 
                   # These tests crash when run with coverage turned on due to an
                   # issue with llvm_gcda_increment_indirect_counter:
                   # http://crbug.com/156058
                   'cookies/cookie_monster_unittest.cc',
                   'cookies/cookie_store_unittest.h',
                   'http/http_auth_controller_unittest.cc',
                   'http/http_network_layer_unittest.cc',
                   'http/http_network_transaction_spdy2_unittest.cc',
                   'http/http_network_transaction_spdy3_unittest.cc',
@@ skipping 717 matching lines @@
                 '--result', '<@(_outputs)',
                 '--isolate', 'net_unittests.isolate',
               ],
             },
           ],
         },
       ],
     }],
   ],
 }