Merge from Chromium at DEPS revision r198571
This commit was generated by merge_to_master.py.
Change-Id: I951118a03836157090561764dd2627f0add8118f
diff --git a/net/net.gyp b/net/net.gyp
index cb8b401..8181589 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -7,7 +7,7 @@
'chromium_code': 1,
'linux_link_kerberos%': 0,
- 'use_simple_cache_backend%': 0,
+ 'use_tracing_cache_backend%': 0,
'conditions': [
['chromeos==1 or OS=="android" or OS=="ios"', {
# Disable Kerberos on ChromeOS, Android and iOS, at least for now.
@@ -83,8 +83,6 @@
'base/address_list.h',
'base/address_tracker_linux.cc',
'base/address_tracker_linux.h',
- 'base/asn1_util.cc',
- 'base/asn1_util.h',
'base/auth.cc',
'base/auth.h',
'base/backoff_entry.cc',
@@ -94,38 +92,9 @@
'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',
- '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',
'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',
@@ -139,8 +108,6 @@
'base/dns_util.h',
'base/escape.cc',
'base/escape.h',
- 'base/ev_root_ca_metadata.cc',
- 'base/ev_root_ca_metadata.h',
'base/expiring_cache.h',
'base/file_stream.cc',
'base/file_stream.h',
@@ -165,8 +132,6 @@
'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',
@@ -192,8 +157,6 @@
'base/mime_sniffer.h',
'base/mime_util.cc',
'base/mime_util.h',
- 'base/multi_threaded_cert_verifier.cc',
- 'base/multi_threaded_cert_verifier.h',
'base/net_error_list.h',
'base/net_errors.cc',
'base/net_errors.h',
@@ -223,17 +186,13 @@
'base/network_config_watcher_mac.h',
'base/network_delegate.cc',
'base/network_delegate.h',
- 'base/nss_cert_database.cc',
- 'base/nss_cert_database.h',
+ 'base/network_time_notifier.cc',
+ 'base/network_time_notifier.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',
'base/platform_mime_util.h',
# TODO(tc): gnome-vfs? xdgmime? /etc/mime.types?
'base/platform_mime_util_linux.cc',
@@ -250,26 +209,11 @@
'base/sdch_filter.h',
'base/sdch_manager.cc',
'base/sdch_manager.h',
- 'base/single_request_cert_verifier.cc',
- 'base/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',
- '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',
@@ -289,33 +233,83 @@
'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',
'base/zap.cc',
'base/zap.h',
+ 'cert/asn1_util.cc',
+ 'cert/asn1_util.h',
+ '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',
+ 'cert/cert_status_flags.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',
+ 'cert/crl_set.cc',
+ 'cert/crl_set.h',
+ 'cert/ev_root_ca_metadata.cc',
+ 'cert/ev_root_ca_metadata.h',
+ 'cert/multi_threaded_cert_verifier.cc',
+ 'cert/multi_threaded_cert_verifier.h',
+ 'cert/nss_cert_database.cc',
+ 'cert/nss_cert_database.h',
+ 'cert/pem_tokenizer.cc',
+ 'cert/pem_tokenizer.h',
+ 'cert/single_request_cert_verifier.cc',
+ 'cert/single_request_cert_verifier.h',
+ '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',
+ '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',
'cookies/canonical_cookie.cc',
'cookies/canonical_cookie.h',
+ 'cookies/cookie_constants.cc',
+ 'cookies/cookie_constants.h',
'cookies/cookie_monster.cc',
'cookies/cookie_monster.h',
'cookies/cookie_options.h',
@@ -333,7 +327,9 @@
'disk_cache/bitmap.h',
'disk_cache/block_files.cc',
'disk_cache/block_files.h',
+ 'disk_cache/cache_creator.cc',
'disk_cache/cache_util.h',
+ 'disk_cache/cache_util.cc',
'disk_cache/cache_util_posix.cc',
'disk_cache/cache_util_win.cc',
'disk_cache/disk_cache.h',
@@ -382,14 +378,27 @@
'disk_cache/stress_support.h',
'disk_cache/trace.cc',
'disk_cache/trace.h',
+ 'disk_cache/tracing_cache_backend.cc',
+ 'disk_cache/tracing_cache_backend.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_format.cc',
+ 'disk_cache/simple/simple_entry_format.h',
'disk_cache/simple/simple_entry_impl.cc',
'disk_cache/simple/simple_entry_impl.h',
+ 'disk_cache/simple/simple_index.cc',
+ 'disk_cache/simple/simple_index.h',
+ 'disk_cache/simple/simple_index_file.cc',
+ 'disk_cache/simple/simple_index_file.h',
'disk_cache/simple/simple_synchronous_entry.cc',
'disk_cache/simple/simple_synchronous_entry.h',
+ 'disk_cache/simple/simple_util.cc',
+ 'disk_cache/simple/simple_util.h',
+ 'disk_cache/flash/flash_entry_impl.cc',
+ 'disk_cache/flash/flash_entry_impl.h',
'disk_cache/flash/format.h',
+ 'disk_cache/flash/internal_entry.cc',
+ 'disk_cache/flash/internal_entry.h',
'disk_cache/flash/log_store.cc',
'disk_cache/flash/log_store.h',
'disk_cache/flash/log_store_entry.cc',
@@ -423,6 +432,8 @@
'dns/dns_socket_pool.h',
'dns/dns_transaction.cc',
'dns/dns_transaction.h',
+ 'dns/host_cache.cc',
+ 'dns/host_cache.h',
'dns/host_resolver.cc',
'dns/host_resolver.h',
'dns/host_resolver_impl.cc',
@@ -433,6 +444,10 @@
'dns/mapped_host_resolver.h',
'dns/notify_watcher_mac.cc',
'dns/notify_watcher_mac.h',
+ 'dns/record_parsed.cc',
+ 'dns/record_parsed.h',
+ 'dns/record_rdata.cc',
+ 'dns/record_rdata.h',
'dns/serial_worker.cc',
'dns/serial_worker.h',
'dns/single_request_host_resolver.cc',
@@ -574,8 +589,6 @@
'http/http_vary_data.cc',
'http/http_vary_data.h',
'http/http_version.h',
- 'http/infinite_cache.cc',
- 'http/infinite_cache.h',
'http/md4.cc',
'http/md4.h',
'http/partial_data.cc',
@@ -651,6 +664,12 @@
'proxy/proxy_service.cc',
'proxy/proxy_service.h',
'quic/blocked_list.h',
+ 'quic/congestion_control/available_channel_estimator.cc',
+ 'quic/congestion_control/available_channel_estimator.h',
+ 'quic/congestion_control/channel_estimator.cc',
+ 'quic/congestion_control/channel_estimator.h',
+ 'quic/congestion_control/cube_root.cc',
+ 'quic/congestion_control/cube_root.h',
'quic/congestion_control/cubic.cc',
'quic/congestion_control/cubic.h',
'quic/congestion_control/fix_rate_receiver.cc',
@@ -659,12 +678,25 @@
'quic/congestion_control/fix_rate_sender.h',
'quic/congestion_control/hybrid_slow_start.cc',
'quic/congestion_control/hybrid_slow_start.h',
+ 'quic/congestion_control/inter_arrival_bitrate_ramp_up.cc',
+ 'quic/congestion_control/inter_arrival_bitrate_ramp_up.h',
+ 'quic/congestion_control/inter_arrival_overuse_detector.cc',
+ 'quic/congestion_control/inter_arrival_overuse_detector.h',
+ 'quic/congestion_control/inter_arrival_probe.cc',
+ 'quic/congestion_control/inter_arrival_probe.h',
+ 'quic/congestion_control/inter_arrival_receiver.cc',
+ 'quic/congestion_control/inter_arrival_receiver.h',
+ 'quic/congestion_control/inter_arrival_sender.cc',
+ 'quic/congestion_control/inter_arrival_sender.h',
+ 'quic/congestion_control/inter_arrival_state_machine.cc',
+ 'quic/congestion_control/inter_arrival_state_machine.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_congestion_manager.cc',
'quic/congestion_control/quic_congestion_manager.h',
+ 'quic/congestion_control/quic_max_sized_map.h',
'quic/congestion_control/receive_algorithm_interface.cc',
'quic/congestion_control/receive_algorithm_interface.h',
'quic/congestion_control/send_algorithm_interface.cc',
@@ -684,6 +716,10 @@
'quic/crypto/crypto_handshake.cc',
'quic/crypto/crypto_handshake.h',
'quic/crypto/crypto_protocol.h',
+ 'quic/crypto/crypto_server_config.cc',
+ 'quic/crypto/crypto_server_config.h',
+ 'quic/crypto/crypto_server_config_protobuf.cc',
+ 'quic/crypto/crypto_server_config_protobuf.h',
'quic/crypto/crypto_utils.cc',
'quic/crypto/crypto_utils.h',
'quic/crypto/curve25519_key_exchange.cc',
@@ -696,6 +732,7 @@
'quic/crypto/p256_key_exchange.h',
'quic/crypto/p256_key_exchange_nss.cc',
'quic/crypto/p256_key_exchange_openssl.cc',
+ 'quic/crypto/proof_source.h',
'quic/crypto/quic_decrypter.cc',
'quic/crypto/quic_decrypter.h',
'quic/crypto/quic_encrypter.cc',
@@ -703,11 +740,17 @@
'quic/crypto/quic_random.cc',
'quic/crypto/quic_random.h',
'quic/crypto/scoped_evp_cipher_ctx.h',
+ 'quic/crypto/strike_register.cc',
+ 'quic/crypto/strike_register.h',
+ 'quic/crypto/source_address_token.cc',
+ 'quic/crypto/source_address_token.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_config.cc',
+ 'quic/quic_config.h',
'quic/quic_crypto_client_stream.cc',
'quic/quic_crypto_client_stream.h',
'quic/quic_crypto_client_stream_factory.h',
@@ -801,6 +844,8 @@
'socket/ssl_server_socket_nss.h',
'socket/ssl_server_socket_openssl.cc',
'socket/ssl_socket.h',
+ 'socket/stream_listen_socket.cc',
+ 'socket/stream_listen_socket.h',
'socket/stream_socket.cc',
'socket/stream_socket.h',
'socket/tcp_client_socket.cc',
@@ -809,6 +854,8 @@
'socket/tcp_client_socket_libevent.h',
'socket/tcp_client_socket_win.cc',
'socket/tcp_client_socket_win.h',
+ 'socket/tcp_listen_socket.cc',
+ 'socket/tcp_listen_socket.h',
'socket/tcp_server_socket.h',
'socket/tcp_server_socket_libevent.cc',
'socket/tcp_server_socket_libevent.h',
@@ -816,6 +863,8 @@
'socket/tcp_server_socket_win.h',
'socket/transport_client_socket_pool.cc',
'socket/transport_client_socket_pool.h',
+ 'socket/unix_domain_socket_posix.cc',
+ 'socket/unix_domain_socket_posix.h',
'socket_stream/socket_stream.cc',
'socket_stream/socket_stream.h',
'socket_stream/socket_stream_job.cc',
@@ -827,6 +876,10 @@
'spdy/buffered_spdy_framer.cc',
'spdy/buffered_spdy_framer.h',
'spdy/spdy_bitmasks.h',
+ 'spdy/spdy_buffer.cc',
+ 'spdy/spdy_buffer.h',
+ 'spdy/spdy_buffer_producer.cc',
+ 'spdy/spdy_buffer_producer.h',
'spdy/spdy_credential_builder.cc',
'spdy/spdy_credential_builder.h',
'spdy/spdy_credential_state.cc',
@@ -843,12 +896,13 @@
'spdy/spdy_http_stream.h',
'spdy/spdy_http_utils.cc',
'spdy/spdy_http_utils.h',
- 'spdy/spdy_io_buffer.cc',
- 'spdy/spdy_io_buffer.h',
+ 'spdy/spdy_priority_forest.h',
'spdy/spdy_protocol.cc',
'spdy/spdy_protocol.h',
'spdy/spdy_proxy_client_socket.cc',
'spdy/spdy_proxy_client_socket.h',
+ 'spdy/spdy_read_queue.cc',
+ 'spdy/spdy_read_queue.h',
'spdy/spdy_session.cc',
'spdy/spdy_session.h',
'spdy/spdy_session_pool.cc',
@@ -857,6 +911,8 @@
'spdy/spdy_stream.h',
'spdy/spdy_websocket_stream.cc',
'spdy/spdy_websocket_stream.h',
+ 'spdy/spdy_write_queue.cc',
+ 'spdy/spdy_write_queue.h',
'ssl/client_cert_store.h',
'ssl/client_cert_store_impl.h',
'ssl/client_cert_store_impl_mac.cc',
@@ -864,6 +920,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',
@@ -1079,26 +1137,26 @@
'dns/dns_client.cc',
],
}],
- ['use_simple_cache_backend==1', {
+ ['use_tracing_cache_backend==1', {
'defines': [
- 'USE_SIMPLE_CACHE_BACKEND',
- ]
- }],
+ 'USE_TRACING_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/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',
+ 'cert/cert_database_nss.cc',
+ 'cert/cert_verify_proc_nss.cc',
+ 'cert/cert_verify_proc_nss.h',
+ 'cert/nss_cert_database.cc',
+ 'cert/nss_cert_database.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',
@@ -1121,20 +1179,18 @@
},
{ # 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',
'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/cert_database_openssl.cc',
+ 'cert/cert_verify_proc_openssl.cc',
+ 'cert/cert_verify_proc_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',
@@ -1142,6 +1198,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',
],
},
],
@@ -1183,13 +1241,13 @@
},
{ # else: OS is not in the above list
'sources!': [
- 'base/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/cert_database_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',
@@ -1208,8 +1266,8 @@
}],
[ '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',
],
}],
@@ -1223,6 +1281,14 @@
'spdy/spdy_websocket_stream.h',
],
}],
+ [ 'enable_mdns != 1', {
+ 'sources!' : [
+ 'dns/record_parsed.cc',
+ 'dns/record_parsed.h',
+ 'dns/record_rdata.cc',
+ 'dns/record_rdata.h',
+ ]
+ }],
[ 'OS == "win"', {
'sources!': [
'http/http_auth_handler_ntlm_portable.cc',
@@ -1299,10 +1365,10 @@
'net_jni_headers',
],
'sources!': [
- 'base/cert_database_openssl.cc',
- 'base/cert_verify_proc_openssl.cc',
'base/openssl_private_key_store_memory.cc',
- 'base/test_root_certs_openssl.cc',
+ 'cert/cert_database_openssl.cc',
+ 'cert/cert_verify_proc_openssl.cc',
+ 'cert/test_root_certs_openssl.cc',
],
# The net/android/keystore_openssl.cc source file needs to
# access an OpenSSL-internal header.
@@ -1339,17 +1405,17 @@
['include', '^base/network_change_notifier_mac\\.cc$'],
['include', '^base/network_config_watcher_mac\\.cc$'],
['include', '^base/platform_mime_util_mac\\.mm$'],
- ['include', '^dns/notify_watcher_mac\\.cc$'],
- ['include', '^proxy/proxy_resolver_mac\\.cc$'],
- ['include', '^proxy/proxy_server_mac\\.cc$'],
# The iOS implementation only partially uses NSS and thus does not
# defines |use_nss|. In particular the |USE_NSS| preprocessor
# definition is not used. The following files are needed though:
- ['include', '^base/cert_verify_proc_nss\\.cc$'],
- ['include', '^base/cert_verify_proc_nss\\.h$'],
- ['include', '^base/test_root_certs_nss\\.cc$'],
- ['include', '^base/x509_util_nss\\.cc$'],
- ['include', '^base/x509_util_nss\\.h$'],
+ ['include', '^cert/cert_verify_proc_nss\\.cc$'],
+ ['include', '^cert/cert_verify_proc_nss\\.h$'],
+ ['include', '^cert/test_root_certs_nss\\.cc$'],
+ ['include', '^cert/x509_util_nss\\.cc$'],
+ ['include', '^cert/x509_util_nss\\.h$'],
+ ['include', '^dns/notify_watcher_mac\\.cc$'],
+ ['include', '^proxy/proxy_resolver_mac\\.cc$'],
+ ['include', '^proxy/proxy_server_mac\\.cc$'],
['include', '^ocsp/nss_ocsp\\.cc$'],
['include', '^ocsp/nss_ocsp\\.h$'],
],
@@ -1378,19 +1444,15 @@
'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',
'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',
'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',
@@ -1399,33 +1461,33 @@
'base/mime_util_unittest.cc',
'base/mock_filter_context.cc',
'base/mock_filter_context.h',
- 'base/multi_threaded_cert_verifier_unittest.cc',
+ 'base/net_log_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',
- '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/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',
'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/cert_verify_proc_unittest.cc',
+ 'cert/crl_set_unittest.cc',
+ 'cert/ev_root_ca_metadata_unittest.cc',
+ 'cert/multi_threaded_cert_verifier_unittest.cc',
+ 'cert/nss_cert_database_unittest.cc',
+ 'cert/pem_tokenizer_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_constants_unittest.cc',
'cookies/cookie_monster_unittest.cc',
'cookies/cookie_store_unittest.h',
'cookies/cookie_util_unittest.cc',
@@ -1437,6 +1499,9 @@
'disk_cache/cache_util_unittest.cc',
'disk_cache/entry_unittest.cc',
'disk_cache/mapped_file_unittest.cc',
+ 'disk_cache/simple/simple_index_file_unittest.cc',
+ 'disk_cache/simple/simple_index_unittest.cc',
+ 'disk_cache/simple/simple_util_unittest.cc',
'disk_cache/storage_block_unittest.cc',
'disk_cache/flash/log_store_entry_unittest.cc',
'disk_cache/flash/log_store_unittest.cc',
@@ -1452,9 +1517,12 @@
'dns/dns_response_unittest.cc',
'dns/dns_session_unittest.cc',
'dns/dns_transaction_unittest.cc',
+ 'dns/host_cache_unittest.cc',
'dns/host_resolver_impl_unittest.cc',
'dns/mapped_host_resolver_unittest.cc',
'dns/serial_worker_unittest.cc',
+ 'dns/record_parsed_unittest.cc',
+ 'dns/record_rdata_unittest.cc',
'dns/single_request_host_resolver_unittest.cc',
'ftp/ftp_auth_cache_unittest.cc',
'ftp/ftp_ctrl_response_buffer_unittest.cc',
@@ -1488,6 +1556,7 @@
'http/http_network_layer_unittest.cc',
'http/http_network_transaction_spdy3_unittest.cc',
'http/http_network_transaction_spdy2_unittest.cc',
+ 'http/http_network_transaction_ssl_unittest.cc',
'http/http_pipelined_connection_impl_unittest.cc',
'http/http_pipelined_host_forced_unittest.cc',
'http/http_pipelined_host_impl_unittest.cc',
@@ -1508,7 +1577,6 @@
'http/http_transaction_unittest.h',
'http/http_util_unittest.cc',
'http/http_vary_data_unittest.cc',
- 'http/infinite_cache_unittest.cc',
'http/mock_allow_url_security_manager.cc',
'http/mock_allow_url_security_manager.h',
'http/mock_gssapi_library_posix.cc',
@@ -1538,11 +1606,23 @@
'proxy/proxy_server_unittest.cc',
'proxy/proxy_service_unittest.cc',
'quic/blocked_list_test.cc',
+ 'quic/congestion_control/available_channel_estimator_test.cc',
+ 'quic/congestion_control/channel_estimator_test.cc',
+ 'quic/congestion_control/cube_root_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/inter_arrival_bitrate_ramp_up_test.cc',
+ 'quic/congestion_control/inter_arrival_overuse_detector_test.cc',
+ 'quic/congestion_control/inter_arrival_probe_test.cc',
+ 'quic/congestion_control/inter_arrival_receiver_test.cc',
+ 'quic/congestion_control/inter_arrival_state_machine_test.cc',
+ 'quic/congestion_control/inter_arrival_sender_test.cc',
'quic/congestion_control/leaky_bucket_test.cc',
'quic/congestion_control/paced_sender_test.cc',
+ 'quic/congestion_control/quic_congestion_control_test.cc',
+ 'quic/congestion_control/quic_congestion_manager_test.cc',
+ 'quic/congestion_control/quic_max_sized_map_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',
@@ -1554,6 +1634,7 @@
'quic/crypto/null_encrypter_test.cc',
'quic/crypto/p256_key_exchange_test.cc',
'quic/crypto/quic_random_test.cc',
+ 'quic/crypto/strike_register_test.cc',
'quic/test_tools/crypto_test_utils.cc',
'quic/test_tools/crypto_test_utils.h',
'quic/test_tools/mock_clock.cc',
@@ -1602,6 +1683,7 @@
'quic/quic_stream_factory_test.cc',
'quic/quic_stream_sequencer_test.cc',
'quic/quic_time_test.cc',
+ 'quic/quic_utils_test.cc',
'quic/reliable_quic_stream_test.cc',
'socket/buffered_write_stream_socket_unittest.cc',
'socket/client_socket_pool_base_unittest.cc',
@@ -1616,14 +1698,18 @@
'socket/ssl_client_socket_unittest.cc',
'socket/ssl_server_socket_unittest.cc',
'socket/tcp_client_socket_unittest.cc',
+ 'socket/tcp_listen_socket_unittest.cc',
+ 'socket/tcp_listen_socket_unittest.h',
'socket/tcp_server_socket_unittest.cc',
'socket/transport_client_socket_pool_unittest.cc',
'socket/transport_client_socket_unittest.cc',
+ 'socket/unix_domain_socket_posix_unittest.cc',
'socket_stream/socket_stream_metrics_unittest.cc',
'socket_stream/socket_stream_unittest.cc',
'spdy/buffered_spdy_framer_spdy3_unittest.cc',
'spdy/buffered_spdy_framer_spdy2_unittest.cc',
'spdy/spdy_credential_builder_unittest.cc',
+ 'spdy/spdy_buffer_unittest.cc',
'spdy/spdy_credential_state_unittest.cc',
'spdy/spdy_frame_builder_test.cc',
'spdy/spdy_frame_reader_test.cc',
@@ -1634,9 +1720,11 @@
'spdy/spdy_http_utils_unittest.cc',
'spdy/spdy_network_transaction_spdy3_unittest.cc',
'spdy/spdy_network_transaction_spdy2_unittest.cc',
+ 'spdy/spdy_priority_forest_test.cc',
'spdy/spdy_protocol_test.cc',
'spdy/spdy_proxy_client_socket_spdy3_unittest.cc',
'spdy/spdy_proxy_client_socket_spdy2_unittest.cc',
+ 'spdy/spdy_read_queue_unittest.cc',
'spdy/spdy_session_spdy3_unittest.cc',
'spdy/spdy_session_spdy2_unittest.cc',
'spdy/spdy_session_test_util.cc',
@@ -1659,14 +1747,17 @@
'spdy/spdy_websocket_test_util_spdy2.h',
'spdy/spdy_websocket_test_util_spdy3.cc',
'spdy/spdy_websocket_test_util_spdy3.h',
+ 'spdy/spdy_write_queue_unittest.cc',
'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',
'ssl/ssl_config_service_unittest.cc',
'test/python_utils_unittest.cc',
'test/run_all_unittests.cc',
+ 'test/test_certificate_data.h',
'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',
@@ -1723,7 +1814,7 @@
],
}, { # else use_glib == 0: !posix || mac
'sources!': [
- 'base/nss_cert_database_unittest.cc',
+ 'cert/nss_cert_database_unittest.cc',
],
},
],
@@ -1759,15 +1850,15 @@
# 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',
+ 'ssl/openssl_client_key_store_unittest.cc',
],
},
],
@@ -1805,6 +1896,13 @@
],
},
],
+
+ [ 'enable_mdns != 1', {
+ 'sources!' : [
+ 'dns/record_parsed_unittest.cc',
+ 'dns/record_rdata_unittest.cc',
+ ],
+ }],
[ 'OS == "win"', {
'sources!': [
'dns/dns_config_service_posix_unittest.cc',
@@ -1869,7 +1967,7 @@
# 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',
+ 'socket/unix_domain_socket_posix_unittest.cc',
],
'conditions': [
['coverage != 0', {
@@ -1887,6 +1985,10 @@
'http/http_network_layer_unittest.cc',
'http/http_network_transaction_spdy2_unittest.cc',
'http/http_network_transaction_spdy3_unittest.cc',
+ 'spdy/spdy_http_stream_spdy2_unittest.cc',
+ 'spdy/spdy_http_stream_spdy3_unittest.cc',
+ 'spdy/spdy_proxy_client_socket_spdy3_unittest.cc',
+ 'spdy/spdy_session_spdy3_unittest.cc',
# These tests crash when run with coverage turned on:
# http://crbug.com/177203
@@ -1918,7 +2020,7 @@
}],
[ 'OS != "win" and OS != "mac"', {
'sources!': [
- 'base/x509_cert_types_unittest.cc',
+ 'cert/x509_cert_types_unittest.cc',
],
}],
],
@@ -1981,18 +2083,16 @@
'sources': [
'base/capturing_net_log.cc',
'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/test_completion_callback.cc',
'base/test_completion_callback.h',
'base/test_data_directory.cc',
'base/test_data_directory.h',
+ 'cert/mock_cert_verifier.cc',
+ 'cert/mock_cert_verifier.h',
'cookies/cookie_monster_store_test.cc',
'cookies/cookie_monster_store_test.h',
'cookies/cookie_store_test_callbacks.cc',
@@ -2019,6 +2119,8 @@
'socket/socket_test_util.h',
'test/base_test_server.cc',
'test/base_test_server.h',
+ 'test/cert_test_util.cc',
+ 'test/cert_test_util.h',
'test/local_test_server_posix.cc',
'test/local_test_server_win.cc',
'test/local_test_server.cc',
@@ -2029,9 +2131,9 @@
'test/python_utils.h',
'test/remote_test_server.cc',
'test/remote_test_server.h',
+ 'test/spawned_test_server.h',
'test/spawner_communicator.cc',
'test/spawner_communicator.h',
- 'test/test_server.h',
'url_request/test_url_fetcher_factory.cc',
'url_request/test_url_fetcher_factory.h',
'url_request/url_request_test_util.cc',
@@ -2363,6 +2465,31 @@
['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
'targets': [
{
+ 'target_name': 'flip_balsa_and_epoll_library',
+ 'type': 'static_library',
+ 'dependencies': [
+ '../base/base.gyp:base',
+ 'net',
+ ],
+ 'sources': [
+ 'tools/flip_server/balsa_enums.h',
+ 'tools/flip_server/balsa_frame.cc',
+ 'tools/flip_server/balsa_frame.h',
+ 'tools/flip_server/balsa_headers.cc',
+ 'tools/flip_server/balsa_headers.h',
+ 'tools/flip_server/balsa_headers_token_utils.cc',
+ 'tools/flip_server/balsa_headers_token_utils.h',
+ 'tools/flip_server/balsa_visitor_interface.h',
+ 'tools/flip_server/constants.h',
+ 'tools/flip_server/epoll_server.cc',
+ 'tools/flip_server/epoll_server.h',
+ 'tools/flip_server/http_message_constants.cc',
+ 'tools/flip_server/http_message_constants.h',
+ 'tools/flip_server/split.h',
+ 'tools/flip_server/split.cc',
+ ],
+ },
+ {
'target_name': 'flip_in_mem_edsm_server',
'type': 'executable',
'cflags': [
@@ -2371,6 +2498,7 @@
'dependencies': [
'../base/base.gyp:base',
'../third_party/openssl/openssl.gyp:openssl',
+ 'flip_balsa_and_epoll_library',
'net',
],
'sources': [
@@ -2380,27 +2508,14 @@
'tools/dump_cache/url_utilities.cc',
'tools/flip_server/acceptor_thread.h',
'tools/flip_server/acceptor_thread.cc',
- 'tools/flip_server/balsa_enums.h',
- 'tools/flip_server/balsa_frame.cc',
- 'tools/flip_server/balsa_frame.h',
- 'tools/flip_server/balsa_headers.cc',
- 'tools/flip_server/balsa_headers.h',
- 'tools/flip_server/balsa_headers_token_utils.cc',
- 'tools/flip_server/balsa_headers_token_utils.h',
- 'tools/flip_server/balsa_visitor_interface.h',
'tools/flip_server/buffer_interface.h',
- 'tools/flip_server/constants.h',
'tools/flip_server/create_listener.cc',
'tools/flip_server/create_listener.h',
- 'tools/flip_server/epoll_server.cc',
- 'tools/flip_server/epoll_server.h',
'tools/flip_server/flip_config.cc',
'tools/flip_server/flip_config.h',
'tools/flip_server/flip_in_mem_edsm_server.cc',
'tools/flip_server/http_interface.cc',
'tools/flip_server/http_interface.h',
- 'tools/flip_server/http_message_constants.cc',
- 'tools/flip_server/http_message_constants.h',
'tools/flip_server/loadtime_measurement.h',
'tools/flip_server/mem_cache.h',
'tools/flip_server/mem_cache.cc',
@@ -2413,8 +2528,6 @@
'tools/flip_server/sm_connection.cc',
'tools/flip_server/sm_connection.h',
'tools/flip_server/sm_interface.h',
- 'tools/flip_server/split.h',
- 'tools/flip_server/split.cc',
'tools/flip_server/spdy_ssl.cc',
'tools/flip_server/spdy_ssl.h',
'tools/flip_server/spdy_interface.cc',
@@ -2426,6 +2539,130 @@
'tools/flip_server/string_piece_utils.h',
],
},
+ {
+ 'target_name': 'quic_library',
+ 'type': 'static_library',
+ 'dependencies': [
+ '../base/base.gyp:base',
+ '../crypto/crypto.gyp:crypto',
+ '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+ '../build/temp_gyp/googleurl.gyp:googleurl',
+ '../third_party/openssl/openssl.gyp:openssl',
+ 'flip_balsa_and_epoll_library',
+ 'net',
+ ],
+ 'sources': [
+ 'tools/quic/quic_client.cc',
+ 'tools/quic/quic_client.h',
+ 'tools/quic/quic_client_session.cc',
+ 'tools/quic/quic_client_session.h',
+ 'tools/quic/quic_dispatcher.h',
+ 'tools/quic/quic_dispatcher.cc',
+ 'tools/quic/quic_epoll_clock.cc',
+ 'tools/quic/quic_epoll_clock.h',
+ 'tools/quic/quic_epoll_connection_helper.cc',
+ 'tools/quic/quic_epoll_connection_helper.h',
+ 'tools/quic/quic_in_memory_cache.cc',
+ 'tools/quic/quic_in_memory_cache.h',
+ 'tools/quic/quic_packet_writer.h',
+ 'tools/quic/quic_reliable_client_stream.cc',
+ 'tools/quic/quic_reliable_client_stream.h',
+ 'tools/quic/quic_reliable_server_stream.cc',
+ 'tools/quic/quic_reliable_server_stream.h',
+ 'tools/quic/quic_server.cc',
+ 'tools/quic/quic_server.h',
+ 'tools/quic/quic_server_session.cc',
+ 'tools/quic/quic_server_session.h',
+ 'tools/quic/quic_socket_utils.cc',
+ 'tools/quic/quic_socket_utils.h',
+ 'tools/quic/quic_spdy_client_stream.cc',
+ 'tools/quic/quic_spdy_client_stream.h',
+ 'tools/quic/quic_spdy_server_stream.cc',
+ 'tools/quic/quic_spdy_server_stream.h',
+ 'tools/quic/quic_time_wait_list_manager.h',
+ 'tools/quic/quic_time_wait_list_manager.cc',
+ 'tools/quic/spdy_utils.cc',
+ 'tools/quic/spdy_utils.h',
+ ],
+ },
+ {
+ 'target_name': 'quic_client',
+ 'type': 'executable',
+ 'dependencies': [
+ '../base/base.gyp:base',
+ '../third_party/openssl/openssl.gyp:openssl',
+ 'net',
+ 'quic_library',
+ ],
+ 'sources': [
+ 'tools/quic/quic_client_bin.cc',
+ ],
+ },
+ {
+ 'target_name': 'quic_server',
+ 'type': 'executable',
+ 'dependencies': [
+ '../base/base.gyp:base',
+ '../third_party/openssl/openssl.gyp:openssl',
+ 'net',
+ 'quic_library',
+ ],
+ 'sources': [
+ 'tools/quic/quic_server_bin.cc',
+ ],
+ },
+ {
+ 'target_name': 'quic_unittests',
+ 'type': '<(gtest_target_type)',
+ 'dependencies': [
+ '../base/base.gyp:test_support_base',
+ '../crypto/crypto.gyp:crypto',
+ '../testing/gmock.gyp:gmock',
+ '../testing/gtest.gyp:gtest',
+ 'net',
+ 'quic_library',
+ ],
+ 'sources': [
+ 'quic/test_tools/quic_session_peer.cc',
+ 'quic/test_tools/quic_session_peer.h',
+ '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_random.cc',
+ 'quic/test_tools/mock_random.h',
+ 'quic/test_tools/simple_quic_framer.cc',
+ 'quic/test_tools/simple_quic_framer.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_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',
+ 'tools/flip_server/simple_buffer.cc',
+ 'tools/flip_server/simple_buffer.h',
+ 'tools/quic/end_to_end_test.cc',
+ 'tools/quic/quic_client_session_test.cc',
+ 'tools/quic/quic_dispatcher_test.cc',
+ 'tools/quic/quic_epoll_clock_test.cc',
+ 'tools/quic/quic_epoll_connection_helper_test.cc',
+ 'tools/quic/quic_reliable_client_stream_test.cc',
+ 'tools/quic/quic_reliable_server_stream_test.cc',
+ 'tools/quic/test_tools/http_message_test_utils.cc',
+ 'tools/quic/test_tools/http_message_test_utils.h',
+ 'tools/quic/test_tools/mock_epoll_server.cc',
+ 'tools/quic/test_tools/mock_epoll_server.h',
+ 'tools/quic/test_tools/quic_test_client.cc',
+ 'tools/quic/test_tools/quic_test_client.h',
+ 'tools/quic/test_tools/quic_test_utils.cc',
+ 'tools/quic/test_tools/quic_test_utils.h',
+ 'tools/quic/test_tools/run_all_unittests.cc',
+ ],
+ }
]
}],
['OS=="android"', {