Merge from Chromium at DEPS revision r190564
This commit was generated by merge_to_master.py.
Change-Id: Icadecbce29854b8fa25fd335b2c1949b5ca5d170
diff --git a/net/net.gyp b/net/net.gyp
index df18e20..cb8b401 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# 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.
@@ -7,6 +7,7 @@
'chromium_code': 1,
'linux_link_kerberos%': 0,
+ 'use_simple_cache_backend%': 0,
'conditions': [
['chromeos==1 or OS=="android" or OS=="ios"', {
# Disable Kerberos on ChromeOS, Android and iOS, at least for now.
@@ -15,9 +16,12 @@
}, { # chromeos == 0
'use_kerberos%': 1,
}],
- ['OS=="android"', {
+ ['OS=="android" and target_arch != "ia32"', {
# The way the cache uses mmap() is inefficient on some Android devices.
# If this flag is set, we hackily avoid using mmap() in the disk cache.
+ # We are pretty confident that mmap-ing the index would not hurt any
+ # existing x86 android devices, but we cannot be so sure about the
+ # variety of ARM devices. So enable it for x86 only for now.
'posix_avoid_mmap%': 1,
}, {
'posix_avoid_mmap%': 0,
@@ -56,10 +60,20 @@
'net_resources',
],
'sources': [
+ 'android/cert_verify_result_android.h',
+ 'android/cert_verify_result_android_list.h',
+ 'android/gurl_utils.cc',
+ 'android/gurl_utils.h',
+ 'android/keystore.cc',
+ 'android/keystore.h',
+ 'android/keystore_openssl.cc',
+ 'android/keystore_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',
@@ -82,6 +96,7 @@
'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',
@@ -89,10 +104,13 @@
'base/cert_database_win.cc',
'base/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',
@@ -113,20 +131,12 @@
'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',
'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/dnsrr_resolver.cc',
- 'base/dnsrr_resolver.h',
- 'base/dnssec_chain_verifier.cc',
- 'base/dnssec_chain_verifier.h',
- 'base/dnssec_keyset.cc',
- 'base/dnssec_keyset.h',
'base/escape.cc',
'base/escape.h',
'base/ev_root_ca_metadata.cc',
@@ -147,22 +157,20 @@
'base/file_stream_whence.h',
'base/filter.cc',
'base/filter.h',
+ 'base/int128.cc',
+ 'base/int128.h',
'base/gzip_filter.cc',
'base/gzip_filter.h',
'base/gzip_header.cc',
'base/gzip_header.h',
+ 'base/hash_value.cc',
+ 'base/hash_value.h',
'base/host_cache.cc',
'base/host_cache.h',
'base/host_mapping_rules.cc',
'base/host_mapping_rules.h',
'base/host_port_pair.cc',
'base/host_port_pair.h',
- 'base/host_resolver.cc',
- 'base/host_resolver.h',
- 'base/host_resolver_impl.cc',
- 'base/host_resolver_impl.h',
- 'base/host_resolver_proc.cc',
- 'base/host_resolver_proc.h',
'base/io_buffer.cc',
'base/io_buffer.h',
'base/ip_endpoint.cc',
@@ -173,12 +181,13 @@
'base/keygen_handler_nss.cc',
'base/keygen_handler_openssl.cc',
'base/keygen_handler_win.cc',
+ 'base/linked_hash_map.h',
'base/load_flags.h',
'base/load_flags_list.h',
'base/load_states.h',
'base/load_states_list.h',
- 'base/mapped_host_resolver.cc',
- 'base/mapped_host_resolver.h',
+ 'base/load_timing_info.cc',
+ 'base/load_timing_info.h',
'base/mime_sniffer.cc',
'base/mime_sniffer.h',
'base/mime_util.cc',
@@ -218,9 +227,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',
@@ -239,27 +250,8 @@
'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',
'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',
@@ -274,10 +266,8 @@
'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',
'base/unix_domain_socket_posix.cc',
'base/unix_domain_socket_posix.h',
'base/upload_bytes_element_reader.cc',
@@ -293,6 +283,8 @@
'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',
@@ -390,11 +382,22 @@
'disk_cache/stress_support.h',
'disk_cache/trace.cc',
'disk_cache/trace.h',
+ 'disk_cache/simple/simple_backend_impl.cc',
+ 'disk_cache/simple/simple_backend_impl.h',
+ 'disk_cache/simple/simple_disk_format.h',
+ 'disk_cache/simple/simple_entry_impl.cc',
+ 'disk_cache/simple/simple_entry_impl.h',
+ 'disk_cache/simple/simple_synchronous_entry.cc',
+ 'disk_cache/simple/simple_synchronous_entry.h',
'disk_cache/flash/format.h',
- 'disk_cache/flash/segment.h',
+ 'disk_cache/flash/log_store.cc',
+ 'disk_cache/flash/log_store.h',
+ 'disk_cache/flash/log_store_entry.cc',
+ 'disk_cache/flash/log_store_entry.h',
'disk_cache/flash/segment.cc',
- 'disk_cache/flash/storage.h',
+ 'disk_cache/flash/segment.h',
'disk_cache/flash/storage.cc',
+ 'disk_cache/flash/storage.h',
'dns/address_sorter.h',
'dns/address_sorter_posix.cc',
'dns/address_sorter_posix.h',
@@ -416,12 +419,24 @@
'dns/dns_response.h',
'dns/dns_session.cc',
'dns/dns_session.h',
+ 'dns/dns_socket_pool.cc',
+ 'dns/dns_socket_pool.h',
'dns/dns_transaction.cc',
'dns/dns_transaction.h',
+ 'dns/host_resolver.cc',
+ 'dns/host_resolver.h',
+ 'dns/host_resolver_impl.cc',
+ 'dns/host_resolver_impl.h',
+ 'dns/host_resolver_proc.cc',
+ 'dns/host_resolver_proc.h',
+ 'dns/mapped_host_resolver.cc',
+ 'dns/mapped_host_resolver.h',
'dns/notify_watcher_mac.cc',
'dns/notify_watcher_mac.h',
'dns/serial_worker.cc',
'dns/serial_worker.h',
+ 'dns/single_request_host_resolver.cc',
+ 'dns/single_request_host_resolver.h',
'ftp/ftp_auth_cache.cc',
'ftp/ftp_auth_cache.h',
'ftp/ftp_ctrl_response_buffer.cc',
@@ -531,6 +546,8 @@
'http/http_response_headers.h',
'http/http_response_info.cc',
'http/http_response_info.h',
+ 'http/http_security_headers.cc',
+ 'http/http_security_headers.h',
'http/http_server_properties.cc',
'http/http_server_properties.h',
'http/http_server_properties_impl.cc',
@@ -565,6 +582,9 @@
'http/partial_data.h',
'http/proxy_client_socket.h',
'http/proxy_client_socket.cc',
+ 'http/transport_security_state.cc',
+ 'http/transport_security_state.h',
+ 'http/transport_security_state_static.h',
'http/url_security_manager.cc',
'http/url_security_manager.h',
'http/url_security_manager_posix.cc',
@@ -612,11 +632,8 @@
'proxy/proxy_list.h',
'proxy/proxy_resolver.h',
'proxy/proxy_resolver_error_observer.h',
- 'proxy/proxy_resolver_js_bindings.cc',
- 'proxy/proxy_resolver_js_bindings.h',
'proxy/proxy_resolver_mac.cc',
'proxy/proxy_resolver_mac.h',
- 'proxy/proxy_resolver_request_context.h',
'proxy/proxy_resolver_script.h',
'proxy/proxy_resolver_script_data.cc',
'proxy/proxy_resolver_script_data.h',
@@ -633,39 +650,69 @@
'proxy/proxy_server_mac.cc',
'proxy/proxy_service.cc',
'proxy/proxy_service.h',
- 'proxy/sync_host_resolver.h',
- 'proxy/sync_host_resolver_bridge.cc',
- 'proxy/sync_host_resolver_bridge.h',
+ 'quic/blocked_list.h',
+ 'quic/congestion_control/cubic.cc',
+ 'quic/congestion_control/cubic.h',
'quic/congestion_control/fix_rate_receiver.cc',
'quic/congestion_control/fix_rate_receiver.h',
'quic/congestion_control/fix_rate_sender.cc',
'quic/congestion_control/fix_rate_sender.h',
+ 'quic/congestion_control/hybrid_slow_start.cc',
+ 'quic/congestion_control/hybrid_slow_start.h',
'quic/congestion_control/leaky_bucket.cc',
'quic/congestion_control/leaky_bucket.h',
'quic/congestion_control/paced_sender.cc',
'quic/congestion_control/paced_sender.h',
- 'quic/congestion_control/quic_receipt_metrics_collector.cc',
- 'quic/congestion_control/quic_receipt_metrics_collector.h',
- 'quic/congestion_control/quic_send_scheduler.cc',
- 'quic/congestion_control/quic_send_scheduler.h',
+ 'quic/congestion_control/quic_congestion_manager.cc',
+ 'quic/congestion_control/quic_congestion_manager.h',
'quic/congestion_control/receive_algorithm_interface.cc',
'quic/congestion_control/receive_algorithm_interface.h',
'quic/congestion_control/send_algorithm_interface.cc',
'quic/congestion_control/send_algorithm_interface.h',
+ 'quic/congestion_control/tcp_cubic_sender.cc',
+ 'quic/congestion_control/tcp_cubic_sender.h',
+ 'quic/congestion_control/tcp_receiver.cc',
+ 'quic/congestion_control/tcp_receiver.h',
+ 'quic/crypto/aes_128_gcm_decrypter.h',
+ 'quic/crypto/aes_128_gcm_decrypter_nss.cc',
+ 'quic/crypto/aes_128_gcm_decrypter_openssl.cc',
+ 'quic/crypto/aes_128_gcm_encrypter.h',
+ 'quic/crypto/aes_128_gcm_encrypter_nss.cc',
+ 'quic/crypto/aes_128_gcm_encrypter_openssl.cc',
'quic/crypto/crypto_framer.cc',
'quic/crypto/crypto_framer.h',
- 'quic/crypto/crypto_protocol.cc',
+ 'quic/crypto/crypto_handshake.cc',
+ 'quic/crypto/crypto_handshake.h',
'quic/crypto/crypto_protocol.h',
+ 'quic/crypto/crypto_utils.cc',
+ 'quic/crypto/crypto_utils.h',
+ 'quic/crypto/curve25519_key_exchange.cc',
+ 'quic/crypto/curve25519_key_exchange.h',
+ 'quic/crypto/key_exchange.h',
'quic/crypto/null_decrypter.cc',
+ 'quic/crypto/null_decrypter.h',
'quic/crypto/null_encrypter.cc',
- 'quic/crypto/quic_decrypter.h',
+ 'quic/crypto/null_encrypter.h',
+ 'quic/crypto/p256_key_exchange.h',
+ 'quic/crypto/p256_key_exchange_nss.cc',
+ 'quic/crypto/p256_key_exchange_openssl.cc',
'quic/crypto/quic_decrypter.cc',
- 'quic/crypto/quic_encrypter.h',
+ 'quic/crypto/quic_decrypter.h',
'quic/crypto/quic_encrypter.cc',
+ 'quic/crypto/quic_encrypter.h',
+ 'quic/crypto/quic_random.cc',
+ 'quic/crypto/quic_random.h',
+ 'quic/crypto/scoped_evp_cipher_ctx.h',
+ 'quic/quic_bandwidth.cc',
+ 'quic/quic_bandwidth.h',
+ 'quic/quic_blocked_writer_interface.h',
'quic/quic_client_session.cc',
'quic/quic_client_session.h',
'quic/quic_crypto_client_stream.cc',
'quic/quic_crypto_client_stream.h',
+ 'quic/quic_crypto_client_stream_factory.h',
+ 'quic/quic_crypto_server_stream.cc',
+ 'quic/quic_crypto_server_stream.h',
'quic/quic_crypto_stream.cc',
'quic/quic_crypto_stream.h',
'quic/quic_clock.cc',
@@ -674,6 +721,8 @@
'quic/quic_connection.h',
'quic/quic_connection_helper.cc',
'quic/quic_connection_helper.h',
+ 'quic/quic_connection_logger.cc',
+ 'quic/quic_connection_logger.h',
'quic/quic_data_reader.cc',
'quic/quic_data_reader.h',
'quic/quic_data_writer.cc',
@@ -682,14 +731,24 @@
'quic/quic_fec_group.h',
'quic/quic_framer.cc',
'quic/quic_framer.h',
+ 'quic/quic_http_stream.cc',
+ 'quic/quic_http_stream.h',
'quic/quic_packet_creator.cc',
'quic/quic_packet_creator.h',
+ 'quic/quic_packet_entropy_manager.cc',
+ 'quic/quic_packet_entropy_manager.h',
+ 'quic/quic_packet_generator.cc',
+ 'quic/quic_packet_generator.h',
'quic/quic_protocol.cc',
'quic/quic_protocol.h',
'quic/quic_reliable_client_stream.cc',
'quic/quic_reliable_client_stream.h',
'quic/quic_session.cc',
'quic/quic_session.h',
+ 'quic/quic_stats.cc',
+ 'quic/quic_stats.h',
+ 'quic/quic_stream_factory.cc',
+ 'quic/quic_stream_factory.h',
'quic/quic_stream_sequencer.cc',
'quic/quic_stream_sequencer.h',
'quic/quic_time.cc',
@@ -729,16 +788,12 @@
'socket/socks_client_socket_pool.h',
'socket/ssl_client_socket.cc',
'socket/ssl_client_socket.h',
- 'socket/ssl_client_socket_mac.cc',
- 'socket/ssl_client_socket_mac.h',
'socket/ssl_client_socket_nss.cc',
'socket/ssl_client_socket_nss.h',
'socket/ssl_client_socket_openssl.cc',
'socket/ssl_client_socket_openssl.h',
'socket/ssl_client_socket_pool.cc',
'socket/ssl_client_socket_pool.h',
- 'socket/ssl_client_socket_win.cc',
- 'socket/ssl_client_socket_win.h',
'socket/ssl_error_params.cc',
'socket/ssl_error_params.h',
'socket/ssl_server_socket.h',
@@ -790,6 +845,7 @@
'spdy/spdy_http_utils.h',
'spdy/spdy_io_buffer.cc',
'spdy/spdy_io_buffer.h',
+ 'spdy/spdy_protocol.cc',
'spdy/spdy_protocol.h',
'spdy/spdy_proxy_client_socket.cc',
'spdy/spdy_proxy_client_socket.h',
@@ -801,6 +857,30 @@
'spdy/spdy_stream.h',
'spdy/spdy_websocket_stream.cc',
'spdy/spdy_websocket_stream.h',
+ 'ssl/client_cert_store.h',
+ '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',
+ 'ssl/default_server_bound_cert_store.cc',
+ 'ssl/default_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',
+ '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',
@@ -829,6 +909,8 @@
'url_request/ftp_protocol_handler.cc',
'url_request/ftp_protocol_handler.h',
'url_request/http_user_agent_settings.h',
+ 'url_request/protocol_intercept_job_factory.cc',
+ 'url_request/protocol_intercept_job_factory.h',
'url_request/static_http_user_agent_settings.cc',
'url_request/static_http_user_agent_settings.h',
'url_request/url_fetcher.cc',
@@ -840,6 +922,8 @@
'url_request/url_fetcher_factory.h',
'url_request/url_fetcher_impl.cc',
'url_request/url_fetcher_impl.h',
+ 'url_request/url_fetcher_response_writer.cc',
+ 'url_request/url_fetcher_response_writer.h',
'url_request/url_request.cc',
'url_request/url_request.h',
'url_request/url_request_about_job.cc',
@@ -893,6 +977,8 @@
'url_request/url_request_throttler_manager.h',
'url_request/view_cache_helper.cc',
'url_request/view_cache_helper.h',
+ 'websockets/websocket_errors.cc',
+ 'websockets/websocket_errors.h',
'websockets/websocket_frame.cc',
'websockets/websocket_frame.h',
'websockets/websocket_frame_parser.cc',
@@ -993,14 +1079,17 @@
'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',
'base/crypto_module_nss.cc',
- 'base/dnssec_keyset.cc',
- 'base/dnssec_keyset.h',
'base/keygen_handler_nss.cc',
'base/nss_cert_database.cc',
'base/nss_cert_database.h',
@@ -1012,12 +1101,16 @@
'base/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',
@@ -1033,13 +1126,19 @@
'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',
'base/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',
@@ -1111,6 +1210,7 @@
'sources!': [
'base/cert_verify_proc_nss.cc',
'base/cert_verify_proc_nss.h',
+ 'ssl/client_cert_store_impl_nss.cc',
],
}],
[ 'enable_websockets != 1', {
@@ -1130,6 +1230,7 @@
'socket/tcp_client_socket_libevent.h',
'socket/tcp_server_socket_libevent.cc',
'socket/tcp_server_socket_libevent.h',
+ 'ssl/client_cert_store_impl_nss.cc',
'udp/udp_socket_libevent.cc',
'udp/udp_socket_libevent.h',
],
@@ -1139,6 +1240,8 @@
'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',
@@ -1151,6 +1254,9 @@
},
],
[ 'OS == "mac"', {
+ 'sources!': [
+ 'ssl/client_cert_store_impl_nss.cc',
+ ],
'dependencies': [
'../third_party/nss/nss.gyp:nspr',
'../third_party/nss/nss.gyp:nss',
@@ -1182,7 +1288,7 @@
},
},
],
- ['OS=="android" and _toolset=="target" and android_build_type == 0', {
+ ['OS=="android" and _toolset=="target" and android_webview_build == 0', {
'dependencies': [
'net_java',
],
@@ -1193,10 +1299,17 @@
'net_jni_headers',
],
'sources!': [
- 'base/dnssec_chain_verifier.cc',
- 'base/openssl_memory_private_key_store.cc',
+ 'base/cert_database_openssl.cc',
+ 'base/cert_verify_proc_openssl.cc',
+ 'base/openssl_private_key_store_memory.cc',
+ 'base/test_root_certs_openssl.cc',
],
- }, { # else OS! = "android"
+ # 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',
@@ -1259,6 +1372,7 @@
'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',
@@ -1267,24 +1381,20 @@
'base/cert_verify_proc_unittest.cc',
'base/crl_set_unittest.cc',
'base/data_url_unittest.cc',
- 'base/default_server_bound_cert_store_unittest.cc',
'base/directory_lister_unittest.cc',
- 'base/dnssec_unittest.cc',
'base/dns_util_unittest.cc',
- 'base/dnsrr_resolver_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',
'base/host_mapping_rules_unittest.cc',
'base/host_port_pair_unittest.cc',
- 'base/host_resolver_impl_unittest.cc',
'base/ip_endpoint_unittest.cc',
'base/keygen_handler_unittest.cc',
- 'base/mapped_host_resolver_unittest.cc',
'base/mime_sniffer_unittest.cc',
'base/mime_util_unittest.cc',
'base/mock_filter_context.cc',
@@ -1292,30 +1402,24 @@
'base/multi_threaded_cert_verifier_unittest.cc',
'base/net_log_unittest.h',
'base/net_util_unittest.cc',
- 'base/network_change_notifier_linux_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',
- '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',
'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',
'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',
@@ -1334,6 +1438,8 @@
'disk_cache/entry_unittest.cc',
'disk_cache/mapped_file_unittest.cc',
'disk_cache/storage_block_unittest.cc',
+ 'disk_cache/flash/log_store_entry_unittest.cc',
+ 'disk_cache/flash/log_store_unittest.cc',
'disk_cache/flash/segment_unittest.cc',
'disk_cache/flash/storage_unittest.cc',
'dns/address_sorter_posix_unittest.cc',
@@ -1344,8 +1450,12 @@
'dns/dns_hosts_unittest.cc',
'dns/dns_query_unittest.cc',
'dns/dns_response_unittest.cc',
+ 'dns/dns_session_unittest.cc',
'dns/dns_transaction_unittest.cc',
+ 'dns/host_resolver_impl_unittest.cc',
+ 'dns/mapped_host_resolver_unittest.cc',
'dns/serial_worker_unittest.cc',
+ 'dns/single_request_host_resolver_unittest.cc',
'ftp/ftp_auth_cache_unittest.cc',
'ftp/ftp_ctrl_response_buffer_unittest.cc',
'ftp/ftp_directory_listing_parser_ls_unittest.cc',
@@ -1390,6 +1500,7 @@
'http/http_request_headers_unittest.cc',
'http/http_response_body_drainer_unittest.cc',
'http/http_response_headers_unittest.cc',
+ 'http/http_security_headers_unittest.cc',
'http/http_server_properties_impl_unittest.cc',
'http/http_stream_factory_impl_unittest.cc',
'http/http_stream_parser_unittest.cc',
@@ -1406,6 +1517,7 @@
'http/mock_http_cache.h',
'http/mock_sspi_library_win.cc',
'http/mock_sspi_library_win.h',
+ 'http/transport_security_state_unittest.cc',
'http/url_security_manager_unittest.cc',
'proxy/dhcp_proxy_script_adapter_fetcher_win_unittest.cc',
'proxy/dhcp_proxy_script_fetcher_factory_unittest.cc',
@@ -1419,40 +1531,78 @@
'proxy/proxy_config_unittest.cc',
'proxy/proxy_info_unittest.cc',
'proxy/proxy_list_unittest.cc',
- 'proxy/proxy_resolver_js_bindings_unittest.cc',
+ 'proxy/proxy_resolver_v8_tracing_unittest.cc',
'proxy/proxy_resolver_v8_unittest.cc',
'proxy/proxy_script_decider_unittest.cc',
'proxy/proxy_script_fetcher_impl_unittest.cc',
'proxy/proxy_server_unittest.cc',
'proxy/proxy_service_unittest.cc',
- 'proxy/sync_host_resolver_bridge_unittest.cc',
+ 'quic/blocked_list_test.cc',
+ 'quic/congestion_control/cubic_test.cc',
'quic/congestion_control/fix_rate_test.cc',
+ 'quic/congestion_control/hybrid_slow_start_test.cc',
'quic/congestion_control/leaky_bucket_test.cc',
'quic/congestion_control/paced_sender_test.cc',
- 'quic/congestion_control/quic_receipt_metrics_collector_test.cc',
- 'quic/congestion_control/quic_send_scheduler_test.cc',
+ 'quic/congestion_control/tcp_cubic_sender_test.cc',
+ 'quic/congestion_control/tcp_receiver_test.cc',
+ 'quic/crypto/aes_128_gcm_decrypter_test.cc',
+ 'quic/crypto/aes_128_gcm_encrypter_test.cc',
'quic/crypto/crypto_framer_test.cc',
+ 'quic/crypto/crypto_handshake_test.cc',
+ 'quic/crypto/curve25519_key_exchange_test.cc',
'quic/crypto/null_decrypter_test.cc',
'quic/crypto/null_encrypter_test.cc',
+ 'quic/crypto/p256_key_exchange_test.cc',
+ 'quic/crypto/quic_random_test.cc',
+ 'quic/test_tools/crypto_test_utils.cc',
+ 'quic/test_tools/crypto_test_utils.h',
'quic/test_tools/mock_clock.cc',
'quic/test_tools/mock_clock.h',
+ 'quic/test_tools/mock_crypto_client_stream.cc',
+ 'quic/test_tools/mock_crypto_client_stream.h',
+ 'quic/test_tools/mock_crypto_client_stream_factory.cc',
+ 'quic/test_tools/mock_crypto_client_stream_factory.h',
+ 'quic/test_tools/mock_random.cc',
+ 'quic/test_tools/mock_random.h',
+ 'quic/test_tools/quic_connection_peer.cc',
+ 'quic/test_tools/quic_connection_peer.h',
+ 'quic/test_tools/quic_framer_peer.cc',
+ 'quic/test_tools/quic_framer_peer.h',
+ 'quic/test_tools/quic_packet_creator_peer.cc',
+ 'quic/test_tools/quic_packet_creator_peer.h',
+ 'quic/test_tools/quic_session_peer.cc',
+ 'quic/test_tools/quic_session_peer.h',
'quic/test_tools/quic_test_utils.cc',
'quic/test_tools/quic_test_utils.h',
+ 'quic/test_tools/reliable_quic_stream_peer.cc',
+ 'quic/test_tools/reliable_quic_stream_peer.h',
+ 'quic/test_tools/simple_quic_framer.cc',
+ 'quic/test_tools/simple_quic_framer.h',
'quic/test_tools/test_task_runner.cc',
'quic/test_tools/test_task_runner.h',
+ 'quic/quic_bandwidth_test.cc',
'quic/quic_client_session_test.cc',
'quic/quic_clock_test.cc',
'quic/quic_connection_helper_test.cc',
'quic/quic_connection_test.cc',
'quic/quic_crypto_client_stream_test.cc',
+ 'quic/quic_crypto_server_stream_test.cc',
'quic/quic_crypto_stream_test.cc',
+ 'quic/quic_data_writer_test.cc',
'quic/quic_fec_group_test.cc',
'quic/quic_framer_test.cc',
+ 'quic/quic_http_stream_test.cc',
+ 'quic/quic_network_transaction_unittest.cc',
'quic/quic_packet_creator_test.cc',
+ 'quic/quic_packet_entropy_manager_test.cc',
+ 'quic/quic_packet_generator_test.cc',
+ 'quic/quic_protocol_test.cc',
'quic/quic_reliable_client_stream_test.cc',
'quic/quic_session_test.cc',
+ 'quic/quic_stream_factory_test.cc',
'quic/quic_stream_sequencer_test.cc',
'quic/quic_time_test.cc',
+ 'quic/reliable_quic_stream_test.cc',
'socket/buffered_write_stream_socket_unittest.cc',
'socket/client_socket_pool_base_unittest.cc',
'socket/deterministic_socket_data_unittest.cc',
@@ -1461,6 +1611,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',
@@ -1474,6 +1625,7 @@
'spdy/buffered_spdy_framer_spdy2_unittest.cc',
'spdy/spdy_credential_builder_unittest.cc',
'spdy/spdy_credential_state_unittest.cc',
+ 'spdy/spdy_frame_builder_test.cc',
'spdy/spdy_frame_reader_test.cc',
'spdy/spdy_framer_test.cc',
'spdy/spdy_header_block_unittest.cc',
@@ -1487,21 +1639,34 @@
'spdy/spdy_proxy_client_socket_spdy2_unittest.cc',
'spdy/spdy_session_spdy3_unittest.cc',
'spdy/spdy_session_spdy2_unittest.cc',
+ 'spdy/spdy_session_test_util.cc',
+ 'spdy/spdy_session_test_util.h',
'spdy/spdy_stream_spdy3_unittest.cc',
'spdy/spdy_stream_spdy2_unittest.cc',
'spdy/spdy_stream_test_util.cc',
'spdy/spdy_stream_test_util.h',
+ 'spdy/spdy_test_util_common.cc',
+ 'spdy/spdy_test_util_common.h',
'spdy/spdy_test_util_spdy3.cc',
'spdy/spdy_test_util_spdy3.h',
'spdy/spdy_test_util_spdy2.cc',
'spdy/spdy_test_util_spdy2.h',
+ 'spdy/spdy_test_utils.cc',
+ 'spdy/spdy_test_utils.h',
'spdy/spdy_websocket_stream_spdy2_unittest.cc',
'spdy/spdy_websocket_stream_spdy3_unittest.cc',
'spdy/spdy_websocket_test_util_spdy2.cc',
'spdy/spdy_websocket_test_util_spdy2.h',
'spdy/spdy_websocket_test_util_spdy3.cc',
'spdy/spdy_websocket_test_util_spdy3.h',
+ 'ssl/client_cert_store_impl_unittest.cc',
+ 'ssl/default_server_bound_cert_store_unittest.cc',
+ 'ssl/server_bound_cert_service_unittest.cc',
+ 'ssl/ssl_cipher_suite_names_unittest.cc',
+ 'ssl/ssl_client_auth_cache_unittest.cc',
+ 'ssl/ssl_config_service_unittest.cc',
'test/python_utils_unittest.cc',
+ 'test/run_all_unittests.cc',
'tools/dump_cache/url_to_filename_encoder.cc',
'tools/dump_cache/url_to_filename_encoder.h',
'tools/dump_cache/url_to_filename_encoder_unittest.cc',
@@ -1513,6 +1678,7 @@
'url_request/url_request_context_builder_unittest.cc',
'url_request/url_request_filter_unittest.cc',
'url_request/url_request_ftp_job_unittest.cc',
+ 'url_request/url_request_http_job_unittest.cc',
'url_request/url_request_job_factory_impl_unittest.cc',
'url_request/url_request_job_unittest.cc',
'url_request/url_request_throttler_simulation_unittest.cc',
@@ -1521,6 +1687,7 @@
'url_request/url_request_throttler_unittest.cc',
'url_request/url_request_unittest.cc',
'url_request/view_cache_helper_unittest.cc',
+ 'websockets/websocket_errors_unittest.cc',
'websockets/websocket_frame_parser_unittest.cc',
'websockets/websocket_frame_unittest.cc',
'websockets/websocket_handshake_handler_unittest.cc',
@@ -1543,6 +1710,11 @@
# No res_ninit() et al on Android, so this doesn't make a lot of
# sense.
'dns/dns_config_service_posix_unittest.cc',
+ 'ssl/client_cert_store_impl_unittest.cc',
+ ],
+ 'dependencies': [
+ 'net_javatests',
+ 'net_test_jni_headers',
],
}],
[ 'use_glib == 1', {
@@ -1587,13 +1759,15 @@
# TODO(bulach): Add equivalent tests when the underlying
# functionality is ported to OpenSSL.
'sources!': [
- 'base/x509_util_nss_unittest.cc',
- 'base/dnssec_unittest.cc',
'base/nss_cert_database_unittest.cc',
+ 'base/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',
+ 'socket/ssl_client_socket_openssl_unittest.cc',
],
},
],
@@ -1627,6 +1801,7 @@
}, { # else: !use_v8_in_net
'sources!': [
'proxy/proxy_resolver_v8_unittest.cc',
+ 'proxy/proxy_resolver_v8_tracing_unittest.cc',
],
},
],
@@ -1643,6 +1818,8 @@
'../third_party/nss/nss.gyp:nss',
'third_party/nss/ssl.gyp:libssl',
],
+ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+ 'msvs_disabled_warnings': [4267, ],
},
],
[ 'OS == "mac"', {
@@ -1683,6 +1860,7 @@
# Need TestServer.
'proxy/proxy_script_fetcher_impl_unittest.cc',
'socket/ssl_client_socket_unittest.cc',
+ 'ssl/client_cert_store_impl_unittest.cc',
'url_request/url_fetcher_impl_unittest.cc',
'url_request/url_request_context_builder_unittest.cc',
# Needs GetAppOutput().
@@ -1698,7 +1876,7 @@
'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',
+ 'http/transport_security_state_unittest.cc',
# These tests crash when run with coverage turned on due to an
# issue with llvm_gcda_increment_indirect_counter:
@@ -1709,6 +1887,10 @@
'http/http_network_layer_unittest.cc',
'http/http_network_transaction_spdy2_unittest.cc',
'http/http_network_transaction_spdy3_unittest.cc',
+
+ # These tests crash when run with coverage turned on:
+ # http://crbug.com/177203
+ 'proxy/proxy_service_unittest.cc',
],
}],
],
@@ -1775,6 +1957,8 @@
'dependencies': [
'../third_party/icu/icu.gyp:icudata',
],
+ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+ 'msvs_disabled_warnings': [4267, ],
},
],
],
@@ -1785,6 +1969,7 @@
'dependencies': [
'../base/base.gyp:base',
'../base/base.gyp:test_support_base',
+ '../build/temp_gyp/googleurl.gyp:googleurl',
'../testing/gtest.gyp:gtest',
'net',
],
@@ -1798,14 +1983,12 @@
'base/capturing_net_log.h',
'base/cert_test_util.cc',
'base/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',
'base/mock_file_stream.cc',
'base/mock_file_stream.h',
- 'base/mock_host_resolver.cc',
- 'base/mock_host_resolver.h',
- 'base/net_test_suite.cc',
- 'base/net_test_suite.h',
'base/test_completion_callback.cc',
'base/test_completion_callback.h',
'base/test_data_directory.cc',
@@ -1824,6 +2007,8 @@
'disk_cache/flash/flash_cache_test_base.cc',
'dns/dns_test_util.cc',
'dns/dns_test_util.h',
+ 'dns/mock_host_resolver.cc',
+ 'dns/mock_host_resolver.h',
'proxy/mock_proxy_resolver.cc',
'proxy/mock_proxy_resolver.h',
'proxy/mock_proxy_script_fetcher.cc',
@@ -1834,12 +2019,12 @@
'socket/socket_test_util.h',
'test/base_test_server.cc',
'test/base_test_server.h',
- 'test/local_sync_test_server.cc',
- 'test/local_sync_test_server.h',
'test/local_test_server_posix.cc',
'test/local_test_server_win.cc',
'test/local_test_server.cc',
'test/local_test_server.h',
+ 'test/net_test_suite.cc',
+ 'test/net_test_suite.h',
'test/python_utils.cc',
'test/python_utils.h',
'test/remote_test_server.cc',
@@ -1855,9 +2040,6 @@
'conditions': [
['inside_chromium_build==1 and OS != "ios"', {
'dependencies': [
- '../chrome/app/policy/cloud_policy_codegen.gyp:cloud_policy_proto_compile',
- # The test server uses Python modules generated by the sync protos.
- '../sync/protocol/sync_proto.gyp:sync_proto',
'../third_party/protobuf/protobuf.gyp:py_proto',
],
}],
@@ -1903,6 +2085,8 @@
},
],
],
+ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+ 'msvs_disabled_warnings': [4267, ],
},
{
'target_name': 'net_resources',
@@ -1939,6 +2123,34 @@
'server/web_socket.cc',
'server/web_socket.h',
],
+ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+ 'msvs_disabled_warnings': [4267, ],
+ },
+ {
+ 'target_name': 'dump_cache',
+ 'type': 'executable',
+ 'dependencies': [
+ '../base/base.gyp:base',
+ 'net',
+ 'net_test_support',
+ ],
+ 'sources': [
+ 'tools/dump_cache/cache_dumper.cc',
+ 'tools/dump_cache/cache_dumper.h',
+ 'tools/dump_cache/dump_cache.cc',
+ 'tools/dump_cache/dump_files.cc',
+ 'tools/dump_cache/dump_files.h',
+ 'tools/dump_cache/simple_cache_dumper.cc',
+ 'tools/dump_cache/simple_cache_dumper.h',
+ 'tools/dump_cache/upgrade_win.cc',
+ 'tools/dump_cache/upgrade_win.h',
+ 'tools/dump_cache/url_to_filename_encoder.cc',
+ 'tools/dump_cache/url_to_filename_encoder.h',
+ 'tools/dump_cache/url_utilities.h',
+ 'tools/dump_cache/url_utilities.cc',
+ ],
+ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+ 'msvs_disabled_warnings': [4267, ],
},
],
'conditions': [
@@ -1960,9 +2172,13 @@
'sources': [
'proxy/proxy_resolver_v8.cc',
'proxy/proxy_resolver_v8.h',
+ 'proxy/proxy_resolver_v8_tracing.cc',
+ 'proxy/proxy_resolver_v8_tracing.h',
'proxy/proxy_service_v8.cc',
'proxy/proxy_service_v8.h',
],
+ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+ 'msvs_disabled_warnings': [4267, ],
},
],
}],
@@ -1981,6 +2197,8 @@
'sources': [
'tools/crash_cache/crash_cache.cc',
],
+ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+ 'msvs_disabled_warnings': [4267, ],
},
{
'target_name': 'crl_set_dump',
@@ -1992,6 +2210,8 @@
'sources': [
'tools/crl_set_dump/crl_set_dump.cc',
],
+ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+ 'msvs_disabled_warnings': [4267, ],
},
{
'target_name': 'dns_fuzz_stub',
@@ -2003,17 +2223,8 @@
'sources': [
'tools/dns_fuzz_stub/dns_fuzz_stub.cc',
],
- },
- {
- 'target_name': 'dnssec_chain_verify',
- 'type': 'executable',
- 'dependencies': [
- '../base/base.gyp:base',
- 'net',
- ],
- 'sources': [
- 'tools/dnssec_chain_verify/dnssec_chain_verify.cc',
- ],
+ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+ 'msvs_disabled_warnings': [4267, ],
},
{
'target_name': 'fetch_client',
@@ -2030,6 +2241,8 @@
'sources': [
'tools/fetch/fetch_client.cc',
],
+ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+ 'msvs_disabled_warnings': [4267, ],
},
{
'target_name': 'fetch_server',
@@ -2053,6 +2266,8 @@
'tools/fetch/http_session.cc',
'tools/fetch/http_session.h',
],
+ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+ 'msvs_disabled_warnings': [4267, ],
},
{
'target_name': 'gdig',
@@ -2078,6 +2293,8 @@
'sources': [
'tools/get_server_time/get_server_time.cc',
],
+ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+ 'msvs_disabled_warnings': [4267, ],
},
{
'target_name': 'net_watcher',
@@ -2087,6 +2304,15 @@
'net',
'net_with_v8',
],
+ 'conditions': [
+ [ 'use_glib == 1', {
+ 'dependencies': [
+ '../build/linux/system.gyp:gconf',
+ '../build/linux/system.gyp:gio',
+ ],
+ },
+ ],
+ ],
'sources': [
'tools/net_watcher/net_watcher.cc',
],
@@ -2096,9 +2322,8 @@
'type': 'executable',
'dependencies': [
'../base/base.gyp:base',
- '../build/temp_gyp/googleurl.gyp:googleurl',
+ '../base/base.gyp:test_support_base',
'../testing/gtest.gyp:gtest',
- 'net',
'net_test_support',
],
'sources': [
@@ -2116,6 +2341,8 @@
'sources': [
'disk_cache/stress_cache.cc',
],
+ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+ 'msvs_disabled_warnings': [4267, ],
},
{
'target_name': 'tld_cleanup',
@@ -2128,6 +2355,8 @@
'sources': [
'tools/tld_cleanup/tld_cleanup.cc',
],
+ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+ 'msvs_disabled_warnings': [4267, ],
},
],
}],
@@ -2197,60 +2426,6 @@
'tools/flip_server/string_piece_utils.h',
],
},
- {
- 'target_name': 'curvecp',
- 'type': 'static_library',
- 'variables': { 'enable_wexit_time_destructors': 1, },
- 'dependencies': [
- '../base/base.gyp:base',
- 'net',
- ],
- 'sources': [
- 'curvecp/circular_buffer.cc',
- 'curvecp/circular_buffer.h',
- 'curvecp/client_packetizer.cc',
- 'curvecp/client_packetizer.h',
- 'curvecp/connection_key.cc',
- 'curvecp/connection_key.h',
- 'curvecp/curvecp_client_socket.cc',
- 'curvecp/curvecp_client_socket.h',
- 'curvecp/curvecp_server_socket.cc',
- 'curvecp/curvecp_server_socket.h',
- 'curvecp/messenger.h',
- 'curvecp/messenger.cc',
- 'curvecp/packetizer.h',
- 'curvecp/protocol.cc',
- 'curvecp/protocol.h',
- 'curvecp/received_block_list.cc',
- 'curvecp/received_block_list.h',
- 'curvecp/rtt_and_send_rate_calculator.cc',
- 'curvecp/rtt_and_send_rate_calculator.h',
- 'curvecp/sent_block_list.cc',
- 'curvecp/sent_block_list.h',
- 'curvecp/server_messenger.cc',
- 'curvecp/server_messenger.h',
- 'curvecp/server_packetizer.cc',
- 'curvecp/server_packetizer.h',
- ],
- },
- {
- 'target_name': 'curvecp_unittests',
- 'type': 'executable',
- 'dependencies': [
- '../base/base.gyp:base',
- '../testing/gmock.gyp:gmock',
- '../testing/gtest.gyp:gtest',
- '../third_party/zlib/zlib.gyp:zlib',
- 'curvecp',
- 'net',
- 'net_test_support',
- ],
- 'sources': [
- 'curvecp/curvecp_transfer_unittest.cc',
- 'curvecp/test_client.cc',
- 'curvecp/test_server.cc',
- ],
- },
]
}],
['OS=="android"', {
@@ -2259,12 +2434,35 @@
'target_name': 'net_jni_headers',
'type': 'none',
'sources': [
+ 'android/java/src/org/chromium/net/AndroidKeyStore.java',
'android/java/src/org/chromium/net/AndroidNetworkLibrary.java',
+ 'android/java/src/org/chromium/net/GURLUtils.java',
'android/java/src/org/chromium/net/NetworkChangeNotifier.java',
'android/java/src/org/chromium/net/ProxyChangeListener.java',
],
'variables': {
- 'jni_gen_dir': 'net',
+ 'jni_gen_package': 'net',
+ },
+ 'direct_dependent_settings': {
+ 'include_dirs': [
+ '<(SHARED_INTERMEDIATE_DIR)/net',
+ ],
+ },
+ 'includes': [ '../build/jni_generator.gypi' ],
+ },
+ {
+ 'target_name': 'net_test_jni_headers',
+ 'type': 'none',
+ 'sources': [
+ 'android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java',
+ ],
+ 'variables': {
+ 'jni_gen_package': 'net',
+ },
+ 'direct_dependent_settings': {
+ 'include_dirs': [
+ '<(SHARED_INTERMEDIATE_DIR)/net',
+ ],
},
'includes': [ '../build/jni_generator.gypi' ],
},
@@ -2272,12 +2470,14 @@
'target_name': 'net_java',
'type': 'none',
'variables': {
- 'package_name': 'net',
'java_in_dir': '../net/android/java',
},
'dependencies': [
'../base/base.gyp:base',
+ 'cert_verify_result_android_java',
+ 'certificate_mime_types_java',
'net_errors_java',
+ 'private_key_types_java',
],
'includes': [ '../build/java.gypi' ],
},
@@ -2285,7 +2485,6 @@
'target_name': 'net_java_test_support',
'type': 'none',
'variables': {
- 'package_name': 'net_java_test_support',
'java_in_dir': '../net/test/android/javatests',
},
'includes': [ '../build/java.gypi' ],
@@ -2294,7 +2493,6 @@
'target_name': 'net_javatests',
'type': 'none',
'variables': {
- 'package_name': 'net_javatests',
'java_in_dir': '../net/android/javatests',
},
'dependencies': [
@@ -2305,38 +2503,52 @@
'includes': [ '../build/java.gypi' ],
},
{
- # This should be extracted to a gypi file and parameterized if
- # we have more use cases of using the preprocessor to build java files.
'target_name': 'net_errors_java',
'type': 'none',
- 'direct_dependent_settings': {
- 'variables': {
- 'generated_src_dirs': ['<(SHARED_INTERMEDIATE_DIR)/net/template/'],
- 'additional_input_paths': ['<(SHARED_INTERMEDIATE_DIR)/net/template/NetError.java'],
- },
- },
- 'actions': [
- {
- 'action_name': 'generate_net_errors_java',
- 'inputs': [
- 'android/java/net_errors_java.template',
- ],
- 'outputs': [
- '<(SHARED_INTERMEDIATE_DIR)/net/template/NetError.java',
- ],
- 'action': [
- 'gcc',
- '-x', 'c-header',
- '-E', '-P',
- '-I', '..',
- '-o',
- '<@(_outputs)',
- '<@(_inputs)',
- ],
- 'message': 'Preprocessing <(_inputs)',
- 'process_outputs_as_sources': 1,
- },
+ 'sources': [
+ 'android/java/NetError.template',
],
+ 'variables': {
+ 'package_name': 'org/chromium/net',
+ 'template_deps': ['base/net_error_list.h'],
+ },
+ 'includes': [ '../build/android/java_cpp_template.gypi' ],
+ },
+ {
+ 'target_name': 'certificate_mime_types_java',
+ 'type': 'none',
+ 'sources': [
+ 'android/java/CertificateMimeType.template',
+ ],
+ 'variables': {
+ 'package_name': 'org/chromium/net',
+ 'template_deps': ['base/mime_util_certificate_type_list.h'],
+ },
+ 'includes': [ '../build/android/java_cpp_template.gypi' ],
+ },
+ {
+ 'target_name': 'cert_verify_result_android_java',
+ 'type': 'none',
+ 'sources': [
+ 'android/java/CertVerifyResultAndroid.template',
+ ],
+ 'variables': {
+ 'package_name': 'org/chromium/net',
+ 'template_deps': ['android/cert_verify_result_android_list.h'],
+ },
+ 'includes': [ '../build/android/java_cpp_template.gypi' ],
+ },
+ {
+ 'target_name': 'private_key_types_java',
+ 'type': 'none',
+ 'sources': [
+ 'android/java/PrivateKeyType.template',
+ ],
+ 'variables': {
+ 'package_name': 'org/chromium/net',
+ 'template_deps': ['android/private_key_type_list.h'],
+ },
+ 'includes': [ '../build/android/java_cpp_template.gypi' ],
},
],
}],
@@ -2350,6 +2562,7 @@
'type': 'none',
'dependencies': [
'net_java',
+ 'net_javatests',
'net_unittests',
],
'variables': {
@@ -2360,31 +2573,6 @@
},
],
}],
- ['OS=="win"', {
- 'targets': [
- {
- # TODO(port): dump_cache is still Windows-specific.
- 'target_name': 'dump_cache',
- 'type': 'executable',
- 'dependencies': [
- '../base/base.gyp:base',
- 'net',
- 'net_test_support',
- ],
- 'sources': [
- 'tools/dump_cache/cache_dumper.cc',
- 'tools/dump_cache/cache_dumper.h',
- 'tools/dump_cache/dump_cache.cc',
- 'tools/dump_cache/dump_files.cc',
- 'tools/dump_cache/upgrade.cc',
- 'tools/dump_cache/url_to_filename_encoder.cc',
- 'tools/dump_cache/url_to_filename_encoder.h',
- 'tools/dump_cache/url_utilities.h',
- 'tools/dump_cache/url_utilities.cc',
- ],
- },
- ],
- }],
['test_isolation_mode != "noop"', {
'targets': [
{