Merge from Chromium at DEPS revision 257591
This commit was generated by merge_to_master.py.
Change-Id: I0010df2ec3fbb5d4947cd026de2feb150ce7a6b5
diff --git a/net/net.gyp b/net/net.gyp
index c4e47df..7e20f5f 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -92,8 +92,6 @@
'base/backoff_entry.h',
'base/bandwidth_metrics.cc',
'base/bandwidth_metrics.h',
- 'base/big_endian.cc',
- 'base/big_endian.h',
'base/cache_type.h',
'base/completion_callback.h',
'base/connection_type_histograms.cc',
@@ -138,6 +136,10 @@
'base/iovec.h',
'base/ip_endpoint.cc',
'base/ip_endpoint.h',
+ 'base/ip_mapping_rules.cc',
+ 'base/ip_mapping_rules.h',
+ 'base/ip_pattern.cc',
+ 'base/ip_pattern.h',
'base/keygen_handler.cc',
'base/keygen_handler.h',
'base/keygen_handler_mac.cc',
@@ -347,70 +349,80 @@
'cookies/cookie_util.h',
'cookies/parsed_cookie.cc',
'cookies/parsed_cookie.h',
- 'disk_cache/addr.cc',
- 'disk_cache/addr.h',
- 'disk_cache/backend_impl.cc',
- 'disk_cache/backend_impl.h',
- 'disk_cache/bitmap.cc',
- 'disk_cache/bitmap.h',
- 'disk_cache/block_files.cc',
- 'disk_cache/block_files.h',
+ 'disk_cache/blockfile/addr.cc',
+ 'disk_cache/blockfile/addr.h',
+ 'disk_cache/blockfile/backend_impl.cc',
+ 'disk_cache/blockfile/backend_impl.h',
+ 'disk_cache/blockfile/backend_impl_v3.cc',
+ 'disk_cache/blockfile/backend_impl_v3.h',
+ 'disk_cache/blockfile/bitmap.cc',
+ 'disk_cache/blockfile/bitmap.h',
+ 'disk_cache/blockfile/block_bitmaps_v3.cc',
+ 'disk_cache/blockfile/block_bitmaps_v3.h',
+ 'disk_cache/blockfile/block_files.cc',
+ 'disk_cache/blockfile/block_files.h',
+ 'disk_cache/blockfile/disk_format.cc',
+ 'disk_cache/blockfile/disk_format.h',
+ 'disk_cache/blockfile/disk_format_base.h',
+ 'disk_cache/blockfile/disk_format_v3.h',
+ 'disk_cache/blockfile/entry_impl.cc',
+ 'disk_cache/blockfile/entry_impl.h',
+ 'disk_cache/blockfile/entry_impl_v3.cc',
+ 'disk_cache/blockfile/entry_impl_v3.h',
+ 'disk_cache/blockfile/errors.h',
+ 'disk_cache/blockfile/eviction.cc',
+ 'disk_cache/blockfile/eviction.h',
+ 'disk_cache/blockfile/eviction_v3.cc',
+ 'disk_cache/blockfile/eviction_v3.h',
+ 'disk_cache/blockfile/experiments.h',
+ 'disk_cache/blockfile/file.cc',
+ 'disk_cache/blockfile/file.h',
+ 'disk_cache/blockfile/file_block.h',
+ 'disk_cache/blockfile/file_ios.cc',
+ 'disk_cache/blockfile/file_lock.cc',
+ 'disk_cache/blockfile/file_lock.h',
+ 'disk_cache/blockfile/file_posix.cc',
+ 'disk_cache/blockfile/file_win.cc',
+ 'disk_cache/blockfile/histogram_macros.h',
+ 'disk_cache/blockfile/histogram_macros_v3.h',
+ 'disk_cache/blockfile/in_flight_backend_io.cc',
+ 'disk_cache/blockfile/in_flight_backend_io.h',
+ 'disk_cache/blockfile/in_flight_io.cc',
+ 'disk_cache/blockfile/in_flight_io.h',
+ 'disk_cache/blockfile/index_table_v3.cc',
+ 'disk_cache/blockfile/index_table_v3.h',
+ 'disk_cache/blockfile/mapped_file.cc',
+ 'disk_cache/blockfile/mapped_file.h',
+ 'disk_cache/blockfile/mapped_file_avoid_mmap_posix.cc',
+ 'disk_cache/blockfile/mapped_file_posix.cc',
+ 'disk_cache/blockfile/mapped_file_win.cc',
+ 'disk_cache/blockfile/rankings.cc',
+ 'disk_cache/blockfile/rankings.h',
+ 'disk_cache/blockfile/sparse_control.cc',
+ 'disk_cache/blockfile/sparse_control.h',
+ 'disk_cache/blockfile/stats.cc',
+ 'disk_cache/blockfile/stats.h',
+ 'disk_cache/blockfile/stats_histogram.cc',
+ 'disk_cache/blockfile/stats_histogram.h',
+ 'disk_cache/blockfile/storage_block-inl.h',
+ 'disk_cache/blockfile/storage_block.h',
+ 'disk_cache/blockfile/stress_support.h',
+ 'disk_cache/blockfile/trace.cc',
+ 'disk_cache/blockfile/trace.h',
'disk_cache/cache_creator.cc',
- 'disk_cache/cache_util.h',
'disk_cache/cache_util.cc',
+ 'disk_cache/cache_util.h',
'disk_cache/cache_util_posix.cc',
'disk_cache/cache_util_win.cc',
'disk_cache/disk_cache.h',
- 'disk_cache/disk_format.cc',
- 'disk_cache/disk_format.h',
- 'disk_cache/disk_format_base.h',
- 'disk_cache/entry_impl.cc',
- 'disk_cache/entry_impl.h',
- 'disk_cache/errors.h',
- 'disk_cache/eviction.cc',
- 'disk_cache/eviction.h',
- 'disk_cache/experiments.h',
- 'disk_cache/file.cc',
- 'disk_cache/file.h',
- 'disk_cache/file_block.h',
- 'disk_cache/file_ios.cc',
- 'disk_cache/file_lock.cc',
- 'disk_cache/file_lock.h',
- 'disk_cache/file_posix.cc',
- 'disk_cache/file_win.cc',
- 'disk_cache/histogram_macros.h',
- 'disk_cache/in_flight_backend_io.cc',
- 'disk_cache/in_flight_backend_io.h',
- 'disk_cache/in_flight_io.cc',
- 'disk_cache/in_flight_io.h',
- 'disk_cache/mapped_file.cc',
- 'disk_cache/mapped_file.h',
- 'disk_cache/mapped_file_posix.cc',
- 'disk_cache/mapped_file_avoid_mmap_posix.cc',
- 'disk_cache/mapped_file_win.cc',
- 'disk_cache/mem_backend_impl.cc',
- 'disk_cache/mem_backend_impl.h',
- 'disk_cache/mem_entry_impl.cc',
- 'disk_cache/mem_entry_impl.h',
- 'disk_cache/mem_rankings.cc',
- 'disk_cache/mem_rankings.h',
+ 'disk_cache/memory/mem_backend_impl.cc',
+ 'disk_cache/memory/mem_backend_impl.h',
+ 'disk_cache/memory/mem_entry_impl.cc',
+ 'disk_cache/memory/mem_entry_impl.h',
+ 'disk_cache/memory/mem_rankings.cc',
+ 'disk_cache/memory/mem_rankings.h',
'disk_cache/net_log_parameters.cc',
'disk_cache/net_log_parameters.h',
- 'disk_cache/rankings.cc',
- 'disk_cache/rankings.h',
- 'disk_cache/sparse_control.cc',
- 'disk_cache/sparse_control.h',
- 'disk_cache/stats.cc',
- 'disk_cache/stats.h',
- 'disk_cache/stats_histogram.cc',
- 'disk_cache/stats_histogram.h',
- 'disk_cache/storage_block-inl.h',
- 'disk_cache/storage_block.h',
- '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_backend_version.h',
@@ -437,31 +449,8 @@
'disk_cache/simple/simple_util.h',
'disk_cache/simple/simple_version_upgrade.cc',
'disk_cache/simple/simple_version_upgrade.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',
- 'disk_cache/flash/log_store_entry.h',
- 'disk_cache/flash/segment.cc',
- 'disk_cache/flash/segment.h',
- 'disk_cache/flash/storage.cc',
- 'disk_cache/flash/storage.h',
- 'disk_cache/v3/backend_impl_v3.cc',
- 'disk_cache/v3/backend_impl_v3.h',
- 'disk_cache/v3/block_bitmaps.cc',
- 'disk_cache/v3/block_bitmaps.h',
- 'disk_cache/v3/disk_format_v3.h',
- 'disk_cache/v3/entry_impl_v3.cc',
- 'disk_cache/v3/entry_impl_v3.h',
- 'disk_cache/v3/eviction_v3.cc',
- 'disk_cache/v3/eviction_v3.h',
- 'disk_cache/v3/histogram_macros.h',
- 'disk_cache/v3/index_table.cc',
- 'disk_cache/v3/index_table.h',
+ 'disk_cache/tracing/tracing_cache_backend.cc',
+ 'disk_cache/tracing/tracing_cache_backend.h',
'dns/address_sorter.h',
'dns/address_sorter_posix.cc',
'dns/address_sorter_posix.h',
@@ -499,6 +488,8 @@
'dns/host_resolver_proc.h',
'dns/mapped_host_resolver.cc',
'dns/mapped_host_resolver.h',
+ 'dns/mapped_ip_resolver.cc',
+ 'dns/mapped_ip_resolver.h',
'dns/mdns_cache.cc',
'dns/mdns_cache.h',
'dns/mdns_client.cc',
@@ -565,6 +556,8 @@
'http/http_auth.h',
'http/http_auth_cache.cc',
'http/http_auth_cache.h',
+ 'http/http_auth_challenge_tokenizer.cc',
+ 'http/http_auth_challenge_tokenizer.h',
'http/http_auth_controller.cc',
'http/http_auth_controller.h',
'http/http_auth_filter.cc',
@@ -772,6 +765,8 @@
'quic/congestion_control/inter_arrival_state_machine.h',
'quic/congestion_control/leaky_bucket.cc',
'quic/congestion_control/leaky_bucket.h',
+ 'quic/congestion_control/loss_detection_interface.cc',
+ 'quic/congestion_control/loss_detection_interface.h',
'quic/congestion_control/paced_sender.cc',
'quic/congestion_control/paced_sender.h',
'quic/congestion_control/pacing_sender.cc',
@@ -779,12 +774,24 @@
'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/rtt_stats.cc',
+ 'quic/congestion_control/rtt_stats.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_loss_algorithm.cc',
+ 'quic/congestion_control/tcp_loss_algorithm.h',
'quic/congestion_control/tcp_receiver.cc',
'quic/congestion_control/tcp_receiver.h',
+ 'quic/congestion_control/time_loss_algorithm.cc',
+ 'quic/congestion_control/time_loss_algorithm.h',
+ 'quic/crypto/aead_base_decrypter.h',
+ 'quic/crypto/aead_base_decrypter_nss.cc',
+ 'quic/crypto/aead_base_decrypter_openssl.cc',
+ 'quic/crypto/aead_base_encrypter.h',
+ 'quic/crypto/aead_base_encrypter_nss.cc',
+ 'quic/crypto/aead_base_encrypter_openssl.cc',
'quic/crypto/aes_128_gcm_12_decrypter.h',
'quic/crypto/aes_128_gcm_12_decrypter_nss.cc',
'quic/crypto/aes_128_gcm_12_decrypter_openssl.cc',
@@ -793,6 +800,12 @@
'quic/crypto/aes_128_gcm_12_encrypter_openssl.cc',
'quic/crypto/cert_compressor.cc',
'quic/crypto/cert_compressor.h',
+ 'quic/crypto/chacha20_poly1305_decrypter.h',
+ 'quic/crypto/chacha20_poly1305_decrypter_nss.cc',
+ 'quic/crypto/chacha20_poly1305_decrypter_openssl.cc',
+ 'quic/crypto/chacha20_poly1305_encrypter.h',
+ 'quic/crypto/chacha20_poly1305_encrypter_nss.cc',
+ 'quic/crypto/chacha20_poly1305_encrypter_openssl.cc',
'quic/crypto/channel_id.cc',
'quic/crypto/channel_id.h',
'quic/crypto/channel_id_nss.cc',
@@ -858,6 +871,8 @@
'quic/quic_ack_notifier.h',
'quic/quic_ack_notifier_manager.cc',
'quic/quic_ack_notifier_manager.h',
+ 'quic/quic_address_mismatch.cc',
+ 'quic/quic_address_mismatch.h',
'quic/quic_alarm.cc',
'quic/quic_alarm.h',
'quic/quic_bandwidth.cc',
@@ -919,18 +934,18 @@
'quic/quic_sent_packet_manager.h',
'quic/quic_session.cc',
'quic/quic_session.h',
+ 'quic/quic_session_key.cc',
+ 'quic/quic_session_key.h',
'quic/quic_socket_address_coder.cc',
'quic/quic_socket_address_coder.h',
- 'quic/quic_spdy_compressor.cc',
- 'quic/quic_spdy_compressor.h',
- 'quic/quic_spdy_decompressor.cc',
- 'quic/quic_spdy_decompressor.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',
'quic/quic_time.h',
+ 'quic/quic_unacked_packet_map.cc',
+ 'quic/quic_unacked_packet_map.h',
'quic/quic_utils.cc',
'quic/quic_utils.h',
'quic/quic_utils_chromium.h',
@@ -1018,6 +1033,7 @@
'socket_stream/socket_stream_metrics.h',
'spdy/buffered_spdy_framer.cc',
'spdy/buffered_spdy_framer.h',
+ 'spdy/hpack_constants.cc',
'spdy/hpack_constants.h',
'spdy/hpack_decoder.cc',
'spdy/hpack_decoder.h',
@@ -1029,6 +1045,8 @@
'spdy/hpack_entry.h',
'spdy/hpack_header_table.cc',
'spdy/hpack_header_table.h',
+ 'spdy/hpack_huffman_table.cc',
+ 'spdy/hpack_huffman_table.h',
'spdy/hpack_input_stream.cc',
'spdy/hpack_input_stream.h',
'spdy/hpack_output_stream.cc',
@@ -1054,6 +1072,10 @@
'spdy/spdy_http_stream.h',
'spdy/spdy_http_utils.cc',
'spdy/spdy_http_utils.h',
+ 'spdy/spdy_pinnable_buffer_piece.cc',
+ 'spdy/spdy_pinnable_buffer_piece.h',
+ 'spdy/spdy_prefixed_buffer_reader.cc',
+ 'spdy/spdy_prefixed_buffer_reader.h',
'spdy/spdy_priority_forest.h',
'spdy/spdy_protocol.cc',
'spdy/spdy_protocol.h',
@@ -1309,11 +1331,11 @@
],
},
'sources!': [
- 'disk_cache/mapped_file_posix.cc',
+ 'disk_cache/blockfile/mapped_file_posix.cc',
],
}, { # else
'sources!': [
- 'disk_cache/mapped_file_avoid_mmap_posix.cc',
+ 'disk_cache/blockfile/mapped_file_avoid_mmap_posix.cc',
],
}],
['disable_ftp_support==1', {
@@ -1364,8 +1386,12 @@
'cert/x509_util_nss.h',
'ocsp/nss_ocsp.cc',
'ocsp/nss_ocsp.h',
+ 'quic/crypto/aead_base_decrypter_nss.cc',
+ 'quic/crypto/aead_base_encrypter_nss.cc',
'quic/crypto/aes_128_gcm_12_decrypter_nss.cc',
'quic/crypto/aes_128_gcm_12_encrypter_nss.cc',
+ 'quic/crypto/chacha20_poly1305_decrypter_nss.cc',
+ 'quic/crypto/chacha20_poly1305_encrypter_nss.cc',
'quic/crypto/channel_id_nss.cc',
'quic/crypto/p256_key_exchange_nss.cc',
'socket/nss_ssl_util.cc',
@@ -1399,8 +1425,12 @@
'cert/x509_certificate_openssl.cc',
'cert/x509_util_openssl.cc',
'cert/x509_util_openssl.h',
+ 'quic/crypto/aead_base_decrypter_openssl.cc',
+ 'quic/crypto/aead_base_encrypter_openssl.cc',
'quic/crypto/aes_128_gcm_12_decrypter_openssl.cc',
'quic/crypto/aes_128_gcm_12_encrypter_openssl.cc',
+ 'quic/crypto/chacha20_poly1305_decrypter_openssl.cc',
+ 'quic/crypto/chacha20_poly1305_encrypter_openssl.cc',
'quic/crypto/channel_id_openssl.cc',
'quic/crypto/p256_key_exchange_openssl.cc',
'quic/crypto/scoped_evp_aead_ctx.cc',
@@ -1650,7 +1680,6 @@
'base/address_list_unittest.cc',
'base/address_tracker_linux_unittest.cc',
'base/backoff_entry_unittest.cc',
- 'base/big_endian_unittest.cc',
'base/data_url_unittest.cc',
'base/directory_lister_unittest.cc',
'base/dns_util_unittest.cc',
@@ -1661,6 +1690,8 @@
'base/host_mapping_rules_unittest.cc',
'base/host_port_pair_unittest.cc',
'base/ip_endpoint_unittest.cc',
+ 'base/ip_mapping_rules_unittest.cc',
+ 'base/ip_pattern_unittest.cc',
'base/keygen_handler_unittest.cc',
'base/mime_sniffer_unittest.cc',
'base/mime_util_unittest.cc',
@@ -1705,26 +1736,23 @@
'cookies/cookie_store_unittest.h',
'cookies/cookie_util_unittest.cc',
'cookies/parsed_cookie_unittest.cc',
- 'disk_cache/addr_unittest.cc',
'disk_cache/backend_unittest.cc',
- 'disk_cache/bitmap_unittest.cc',
- 'disk_cache/block_files_unittest.cc',
+ 'disk_cache/blockfile/addr_unittest.cc',
+ 'disk_cache/blockfile/bitmap_unittest.cc',
+ 'disk_cache/blockfile/block_bitmaps_v3_unittest.cc',
+ 'disk_cache/blockfile/block_bitmaps_v3_unittest.cc',
+ 'disk_cache/blockfile/block_files_unittest.cc',
+ 'disk_cache/blockfile/index_table_v3_unittest.cc',
+ 'disk_cache/blockfile/mapped_file_unittest.cc',
+ 'disk_cache/blockfile/storage_block_unittest.cc',
'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_test_util.h',
'disk_cache/simple/simple_test_util.cc',
+ 'disk_cache/simple/simple_test_util.h',
'disk_cache/simple/simple_util_unittest.cc',
'disk_cache/simple/simple_version_upgrade_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',
- 'disk_cache/v3/block_bitmaps_unittest.cc',
- 'disk_cache/v3/index_table_unittest.cc',
'dns/address_sorter_posix_unittest.cc',
'dns/address_sorter_unittest.cc',
'dns/dns_config_service_posix_unittest.cc',
@@ -1763,6 +1791,7 @@
'http/des_unittest.cc',
'http/disk_cache_based_quic_server_info_unittest.cc',
'http/http_auth_cache_unittest.cc',
+ 'http/http_auth_challenge_tokenizer_unittest.cc',
'http/http_auth_controller_unittest.cc',
'http/http_auth_filter_unittest.cc',
'http/http_auth_gssapi_posix_unittest.cc',
@@ -1851,10 +1880,14 @@
'quic/congestion_control/pacing_sender_test.cc',
'quic/congestion_control/quic_max_sized_map_test.cc',
'quic/congestion_control/tcp_cubic_sender_test.cc',
+ 'quic/congestion_control/tcp_loss_algorithm_test.cc',
'quic/congestion_control/tcp_receiver_test.cc',
+ 'quic/congestion_control/time_loss_algorithm_test.cc',
'quic/crypto/aes_128_gcm_12_decrypter_test.cc',
'quic/crypto/aes_128_gcm_12_encrypter_test.cc',
'quic/crypto/cert_compressor_test.cc',
+ 'quic/crypto/chacha20_poly1305_decrypter_test.cc',
+ 'quic/crypto/chacha20_poly1305_encrypter_test.cc',
'quic/crypto/channel_id_test.cc',
'quic/crypto/common_cert_set_test.cc',
'quic/crypto/crypto_framer_test.cc',
@@ -1915,6 +1948,7 @@
'quic/test_tools/test_task_runner.cc',
'quic/test_tools/test_task_runner.h',
'quic/quic_ack_notifier_test.cc',
+ 'quic/quic_address_mismatch_test.cc',
'quic/quic_alarm_test.cc',
'quic/quic_bandwidth_test.cc',
'quic/quic_client_session_test.cc',
@@ -1940,10 +1974,9 @@
'quic/quic_reliable_client_stream_test.cc',
'quic/quic_sent_entropy_manager_test.cc',
'quic/quic_sent_packet_manager_test.cc',
+ 'quic/quic_session_key_test.cc',
'quic/quic_session_test.cc',
'quic/quic_socket_address_coder_test.cc',
- 'quic/quic_spdy_compressor_test.cc',
- 'quic/quic_spdy_decompressor_test.cc',
'quic/quic_stream_factory_test.cc',
'quic/quic_stream_sequencer_test.cc',
'quic/quic_time_test.cc',
@@ -1982,6 +2015,7 @@
'spdy/hpack_encoding_context_test.cc',
'spdy/hpack_entry_test.cc',
'spdy/hpack_header_table_test.cc',
+ 'spdy/hpack_huffman_table_test.cc',
'spdy/hpack_input_stream_test.cc',
'spdy/hpack_output_stream_test.cc',
'spdy/hpack_string_util_test.cc',
@@ -1996,6 +2030,8 @@
'spdy/spdy_http_stream_unittest.cc',
'spdy/spdy_http_utils_unittest.cc',
'spdy/spdy_network_transaction_unittest.cc',
+ 'spdy/spdy_pinnable_buffer_piece_test.cc',
+ 'spdy/spdy_prefixed_buffer_reader_test.cc',
'spdy/spdy_priority_forest_test.cc',
'spdy/spdy_protocol_test.cc',
'spdy/spdy_proxy_client_socket_unittest.cc',
@@ -2047,6 +2083,7 @@
'tools/tld_cleanup/tld_cleanup_util_unittest.cc',
'udp/udp_socket_unittest.cc',
'url_request/url_fetcher_impl_unittest.cc',
+ 'url_request/url_fetcher_response_writer_unittest.cc',
'url_request/url_request_context_builder_unittest.cc',
'url_request/url_request_filter_unittest.cc',
'url_request/url_request_ftp_job_unittest.cc',
@@ -2103,8 +2140,8 @@
'tools/quic/quic_spdy_client_stream_test.cc',
'tools/quic/quic_spdy_server_stream_test.cc',
'tools/quic/quic_time_wait_list_manager_test.cc',
- 'tools/quic/test_tools/http_message_test_utils.cc',
- 'tools/quic/test_tools/http_message_test_utils.h',
+ 'tools/quic/test_tools/http_message.cc',
+ 'tools/quic/test_tools/http_message.h',
'tools/quic/test_tools/mock_epoll_server.cc',
'tools/quic/test_tools/mock_epoll_server.h',
'tools/quic/test_tools/mock_quic_dispatcher.cc',
@@ -2136,7 +2173,7 @@
[ 'OS == "android"', {
'sources!': [
# See bug 344533.
- 'disk_cache/v3/index_table_unittest.cc',
+ 'disk_cache/blockfile/index_table_v3unittest.cc',
# No res_ninit() et al on Android, so this doesn't make a lot of
# sense.
'dns/dns_config_service_posix_unittest.cc',
@@ -2177,7 +2214,8 @@
],
[ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', {
'conditions': [
- ['linux_use_tcmalloc==1', {
+ # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
+ ['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
],
@@ -2324,7 +2362,7 @@
# KeygenHandler::GenKeyAndSignChallenge() is not ported to iOS.
'base/keygen_handler_unittest.cc',
'disk_cache/backend_unittest.cc',
- 'disk_cache/block_files_unittest.cc',
+ 'disk_cache/blockfile/block_files_unittest.cc',
# Need to read input data files.
'filter/gzip_filter_unittest.cc',
'socket/ssl_server_socket_unittest.cc',
@@ -2386,7 +2424,7 @@
],
'sources': [
'cookies/cookie_monster_perftest.cc',
- 'disk_cache/disk_cache_perftest.cc',
+ 'disk_cache/blockfile/disk_cache_perftest.cc',
'proxy/proxy_resolver_perftest.cc',
],
'conditions': [
@@ -2456,8 +2494,6 @@
'disk_cache/disk_cache_test_base.h',
'disk_cache/disk_cache_test_util.cc',
'disk_cache/disk_cache_test_util.h',
- 'disk_cache/flash/flash_cache_test_base.h',
- 'disk_cache/flash/flash_cache_test_base.cc',
'dns/dns_test_util.cc',
'dns/dns_test_util.h',
'dns/mock_host_resolver.cc',
@@ -2525,7 +2561,8 @@
}],
['os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', {
'conditions': [
- ['linux_use_tcmalloc==1', {
+ # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
+ ['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
],
@@ -2814,7 +2851,7 @@
'net_test_support',
],
'sources': [
- 'disk_cache/stress_cache.cc',
+ 'disk_cache/blockfile/stress_cache.cc',
],
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
'msvs_disabled_warnings': [4267, ],
@@ -3219,5 +3256,159 @@
},
],
}],
+ ['OS=="android"', {
+ # TODO(mef): Consider moving all Cronet Android targets into separate
+ # file. Also figure out what needs to be done for gn script.
+ 'targets': [
+ {
+ 'target_name': 'cronet_jni_headers',
+ 'type': 'none',
+ 'sources': [
+ 'cronet/android/java/src/org/chromium/net/UrlRequest.java',
+ 'cronet/android/java/src/org/chromium/net/UrlRequestContext.java',
+ ],
+ 'variables': {
+ 'jni_gen_package': 'cronet',
+ 'jni_generator_ptr_type': 'long',
+ },
+ 'includes': [ '../build/jni_generator.gypi' ],
+ },
+ {
+ 'target_name': 'libcronet',
+ 'type': 'shared_library',
+ 'dependencies': [
+ '../base/base.gyp:base',
+ '../base/base.gyp:base_i18n',
+ '../third_party/icu/icu.gyp:icui18n',
+ '../third_party/icu/icu.gyp:icuuc',
+ '../url/url.gyp:url_lib',
+ 'cronet_jni_headers',
+ 'net',
+ ],
+ 'sources': [
+ 'cronet/android/org_chromium_net_UrlRequest.cc',
+ 'cronet/android/org_chromium_net_UrlRequest.h',
+ 'cronet/android/org_chromium_net_UrlRequestContext.cc',
+ 'cronet/android/org_chromium_net_UrlRequestContext.h',
+ 'cronet/android/url_request_context_peer.cc',
+ 'cronet/android/url_request_context_peer.h',
+ 'cronet/android/url_request_peer.cc',
+ 'cronet/android/url_request_peer.h',
+ ],
+ 'cflags': [
+ # TODO(mef): Figure out a good way to get version from chrome_version_info_posix.h.
+ '-DCHROMIUM_VERSION=\\"TBD\\"',
+ '-DLOGGING=1',
+ '-fdata-sections',
+ '-ffunction-sections',
+ '-fno-rtti',
+ '-fvisibility=hidden',
+ '-fvisibility-inlines-hidden',
+ '-Wno-sign-promo',
+ '-Wno-missing-field-initializers',
+ ],
+ 'ldflags': [
+ '-llog',
+ '-landroid',
+ '-Wl,--gc-sections',
+ '-Wl,--exclude-libs,ALL'
+ ]
+ },
+ {
+ 'target_name': 'cronet',
+ 'type': 'none',
+ 'dependencies': [
+ '../base/base.gyp:base',
+ 'libcronet',
+ ],
+ 'variables': {
+ 'java_in_dir': 'cronet/android/java',
+ },
+ 'includes': [ '../build/java.gypi' ],
+ },
+ {
+ 'target_name': 'cronet_package',
+ 'type': 'none',
+ 'dependencies': [
+ 'libcronet',
+ 'cronet',
+ ],
+ 'variables': {
+ 'native_lib': 'libcronet.>(android_product_extension)',
+ 'java_lib': 'cronet.jar',
+ 'package_dir': '<(PRODUCT_DIR)/cronet',
+ },
+ 'actions': [
+ {
+ 'action_name': 'strip libcronet',
+ 'inputs': ['<(SHARED_LIB_DIR)/<(native_lib)'],
+ 'outputs': ['<(package_dir)/libs/<(android_app_abi)/<(native_lib)'],
+ 'action': [
+ '<(android_strip)',
+ '--strip-unneeded',
+ '<@(_inputs)',
+ '-o',
+ '<@(_outputs)',
+ ],
+ },
+ ],
+ 'copies': [
+ {
+ 'destination': '<(package_dir)',
+ 'files': [
+ '<(PRODUCT_DIR)/lib.java/<(java_lib)',
+ ],
+ },
+ ],
+ },
+ {
+ 'target_name': 'cronet_sample_apk',
+ 'type': 'none',
+ 'dependencies': [
+ 'cronet',
+ ],
+ 'variables': {
+ 'apk_name': 'CronetSample',
+ 'java_in_dir': 'cronet/android/sample',
+ 'resource_dir': 'cronet/android/sample/res',
+ 'native_lib_target': 'libcronet',
+ },
+ 'includes': [ '../build/java_apk.gypi' ],
+ },
+ {
+ # cronet_sample_apk creates a .jar as a side effect. Any java targets
+ # that need that .jar in their classpath should depend on this target,
+ # cronet_sample_apk_java. Dependents of cronet_sample_apk receive its
+ # jar path in the variable 'apk_output_jar_path'. This target should
+ # only be used by targets which instrument cronet_sample_apk.
+ 'target_name': 'cronet_sample_apk_java',
+ 'type': 'none',
+ 'dependencies': [
+ 'cronet_sample_apk',
+ ],
+ 'includes': [ '../build/apk_fake_jar.gypi' ],
+ },
+ {
+ 'target_name': 'cronet_sample_test_apk',
+ 'type': 'none',
+ 'dependencies': [
+ 'cronet_sample_apk_java',
+ '../base/base.gyp:base_java',
+ '../base/base.gyp:base_javatests',
+ '../base/base.gyp:base_java_test_support',
+ # TODO(mef): Figure out why some tests are failing.
+ #'../net/net.gyp:net_javatests',
+ #'../net/net.gyp:net_java_test_support',
+ ],
+ 'variables': {
+ 'apk_name': 'CronetSampleTest',
+ 'java_in_dir': 'cronet/android/sample/javatests',
+ 'resource_dir': 'cronet/android/sample/res',
+ 'is_test_apk': 1,
+ },
+ 'includes': [ '../build/java_apk.gypi' ],
+ },
+ ],
+ }], # OS=="android"
],
}