Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1703)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/net.gypi

Issue 935333002: Update from https://crrev.com/316786 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/net.gyp ('k') | net/net_unittests.isolate » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/net.gypi
diff --git a/net/net.gypi b/net/net.gypi
index e3f0ee1317692b833d4e49d5b8410629a3c00d16..5a8087d432d832377b9c8c8cefda32f4fb2c2cab 100644
--- a/net/net.gypi
+++ b/net/net.gypi
@@ -25,14 +25,14 @@
'base/escape.h',
'base/hash_value.cc',
'base/hash_value.h',
- 'base/load_timing_info.cc',
- 'base/load_timing_info.h',
'base/host_port_pair.cc',
'base/host_port_pair.h',
'base/io_buffer.cc',
'base/io_buffer.h',
'base/ip_endpoint.cc',
'base/ip_endpoint.h',
+ 'base/load_timing_info.cc',
+ 'base/load_timing_info.h',
'base/net_error_list.h',
'base/net_errors.cc',
'base/net_errors.h',
@@ -85,9 +85,9 @@
'cert/sha256_legacy_support_win.h',
'cert/signed_certificate_timestamp.cc',
'cert/signed_certificate_timestamp.h',
+ 'cert/signed_tree_head.h',
'cert/single_request_cert_verifier.cc',
'cert/single_request_cert_verifier.h',
- 'cert/signed_tree_head.h',
'cert/x509_cert_types.cc',
'cert/x509_cert_types.h',
'cert/x509_certificate.cc',
@@ -166,13 +166,13 @@
'ssl/ssl_info.h',
],
'net_non_nacl_sources': [
+ 'android/android_private_key.cc',
+ 'android/android_private_key.h',
'android/cert_verify_result_android.cc',
'android/cert_verify_result_android.h',
'android/cert_verify_status_android_list.h',
'android/gurl_utils.cc',
'android/gurl_utils.h',
- 'android/android_private_key.cc',
- 'android/android_private_key.h',
'android/keystore.cc',
'android/keystore.h',
'android/keystore_openssl.cc',
@@ -235,6 +235,9 @@
'base/keygen_handler_nss.cc',
'base/keygen_handler_openssl.cc',
'base/keygen_handler_win.cc',
+ # TODO(tc): gnome-vfs? xdgmime? /etc/mime.types?
+ 'base/layered_network_delegate.cc',
+ 'base/layered_network_delegate.h',
'base/linked_hash_map.h',
'base/load_flags.h',
'base/load_flags_list.h',
@@ -273,7 +276,6 @@
'base/nss_memio.c',
'base/nss_memio.h',
'base/platform_mime_util.h',
- # TODO(tc): gnome-vfs? xdgmime? /etc/mime.types?
'base/platform_mime_util_linux.cc',
'base/platform_mime_util_mac.mm',
'base/platform_mime_util_win.cc',
@@ -312,8 +314,6 @@
'base/winsock_init.h',
'base/winsock_util.cc',
'base/winsock_util.h',
- 'base/layered_network_delegate.cc',
- 'base/layered_network_delegate.h',
'cert/cert_database_android.cc',
'cert/cert_database_ios.cc',
'cert/cert_database_mac.cc',
@@ -502,9 +502,9 @@
'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/simple/simple_util_posix.cc',
'disk_cache/simple/simple_util_win.cc',
- 'disk_cache/simple/simple_util.h',
'disk_cache/simple/simple_version_upgrade.cc',
'disk_cache/simple/simple_version_upgrade.h',
'dns/address_sorter.h',
@@ -760,8 +760,6 @@
'proxy/proxy_server_mac.cc',
'proxy/proxy_service.cc',
'proxy/proxy_service.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/hybrid_slow_start.cc',
@@ -772,8 +770,6 @@
'quic/congestion_control/pacing_sender.h',
'quic/congestion_control/prr_sender.cc',
'quic/congestion_control/prr_sender.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',
@@ -782,8 +778,6 @@
'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',
@@ -1241,10 +1235,10 @@
'websockets/websocket_frame.h',
'websockets/websocket_frame_parser.cc',
'websockets/websocket_frame_parser.h',
- 'websockets/websocket_handshake_constants.cc',
- 'websockets/websocket_handshake_constants.h',
'websockets/websocket_handshake_challenge.cc',
'websockets/websocket_handshake_challenge.h',
+ 'websockets/websocket_handshake_constants.cc',
+ 'websockets/websocket_handshake_constants.h',
'websockets/websocket_handshake_request_info.cc',
'websockets/websocket_handshake_request_info.h',
'websockets/websocket_handshake_response_info.cc',
@@ -1283,14 +1277,15 @@
'base/ip_endpoint_unittest.cc',
'base/ip_pattern_unittest.cc',
'base/keygen_handler_unittest.cc',
+ 'base/layered_network_delegate_unittest.cc',
'base/mime_sniffer_unittest.cc',
'base/mime_util_unittest.cc',
'base/net_log_logger_unittest.cc',
'base/net_log_unittest.cc',
'base/net_log_unittest.h',
'base/net_log_util_unittest.cc',
- 'base/net_util_unittest.cc',
'base/net_util_icu_unittest.cc',
+ 'base/net_util_unittest.cc',
'base/network_activity_monitor_unittest.cc',
'base/network_change_notifier_unittest.cc',
'base/network_change_notifier_win_unittest.cc',
@@ -1304,7 +1299,6 @@
'base/upload_bytes_element_reader_unittest.cc',
'base/upload_file_element_reader_unittest.cc',
'base/url_util_unittest.cc',
- 'base/layered_network_delegate_unittest.cc',
'cert/cert_policy_enforcer_unittest.cc',
'cert/cert_verify_proc_unittest.cc',
'cert/crl_set_unittest.cc',
@@ -1365,6 +1359,7 @@
'dns/mapped_host_resolver_unittest.cc',
'dns/mdns_cache_unittest.cc',
'dns/mdns_client_unittest.cc',
+ 'dns/mojo_host_resolver_impl_unittest.cc',
'dns/record_parsed_unittest.cc',
'dns/record_rdata_unittest.cc',
'dns/serial_worker_unittest.cc',
@@ -1456,7 +1451,6 @@
'proxy/proxy_script_fetcher_impl_unittest.cc',
'proxy/proxy_server_unittest.cc',
'proxy/proxy_service_unittest.cc',
- 'quic/congestion_control/cube_root_test.cc',
'quic/congestion_control/cubic_test.cc',
'quic/congestion_control/hybrid_slow_start_test.cc',
'quic/congestion_control/pacing_sender_test.cc',
@@ -1466,7 +1460,6 @@
'quic/congestion_control/send_algorithm_simulator.h',
'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',
@@ -1491,6 +1484,48 @@
'quic/crypto/strike_register_test.cc',
'quic/iovector_test.cc',
'quic/port_suggester_unittest.cc',
+ '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',
+ 'quic/quic_clock_test.cc',
+ 'quic/quic_config_test.cc',
+ 'quic/quic_connection_helper_test.cc',
+ 'quic/quic_connection_logger_unittest.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_stream_test.cc',
+ 'quic/quic_data_writer_test.cc',
+ 'quic/quic_fec_group_test.cc',
+ 'quic/quic_flow_controller_test.cc',
+ 'quic/quic_framer_test.cc',
+ 'quic/quic_headers_stream_test.cc',
+ 'quic/quic_http_stream_test.cc',
+ 'quic/quic_http_utils_test.cc',
+ 'quic/quic_network_transaction_unittest.cc',
+ 'quic/quic_packet_creator_test.cc',
+ 'quic/quic_packet_generator_test.cc',
+ 'quic/quic_protocol_test.cc',
+ 'quic/quic_received_packet_manager_test.cc',
+ 'quic/quic_reliable_client_stream_test.cc',
+ 'quic/quic_sent_entropy_manager_test.cc',
+ 'quic/quic_sent_packet_manager_test.cc',
+ 'quic/quic_server_id_test.cc',
+ 'quic/quic_server_test.cc',
+ 'quic/quic_session_test.cc',
+ 'quic/quic_socket_address_coder_test.cc',
+ 'quic/quic_stream_factory_test.cc',
+ 'quic/quic_stream_sequencer_test.cc',
+ 'quic/quic_sustained_bandwidth_recorder_test.cc',
+ 'quic/quic_time_test.cc',
+ 'quic/quic_unacked_packet_map_test.cc',
+ 'quic/quic_utils_chromium_test.cc',
+ 'quic/quic_utils_test.cc',
+ 'quic/quic_write_blocked_list_test.cc',
+ 'quic/reliable_quic_stream_test.cc',
'quic/test_tools/crypto_test_utils.cc',
'quic/test_tools/crypto_test_utils.h',
'quic/test_tools/crypto_test_utils_chromium.cc',
@@ -1544,48 +1579,6 @@
'quic/test_tools/simple_quic_framer.h',
'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',
- 'quic/quic_clock_test.cc',
- 'quic/quic_config_test.cc',
- 'quic/quic_connection_helper_test.cc',
- 'quic/quic_connection_logger_unittest.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_stream_test.cc',
- 'quic/quic_data_writer_test.cc',
- 'quic/quic_fec_group_test.cc',
- 'quic/quic_flow_controller_test.cc',
- 'quic/quic_framer_test.cc',
- 'quic/quic_headers_stream_test.cc',
- 'quic/quic_http_stream_test.cc',
- 'quic/quic_http_utils_test.cc',
- 'quic/quic_network_transaction_unittest.cc',
- 'quic/quic_packet_creator_test.cc',
- 'quic/quic_packet_generator_test.cc',
- 'quic/quic_protocol_test.cc',
- 'quic/quic_received_packet_manager_test.cc',
- 'quic/quic_reliable_client_stream_test.cc',
- 'quic/quic_sent_entropy_manager_test.cc',
- 'quic/quic_sent_packet_manager_test.cc',
- 'quic/quic_server_id_test.cc',
- 'quic/quic_server_test.cc',
- 'quic/quic_session_test.cc',
- 'quic/quic_socket_address_coder_test.cc',
- 'quic/quic_stream_factory_test.cc',
- 'quic/quic_stream_sequencer_test.cc',
- 'quic/quic_sustained_bandwidth_recorder_test.cc',
- 'quic/quic_time_test.cc',
- 'quic/quic_unacked_packet_map_test.cc',
- 'quic/quic_utils_chromium_test.cc',
- 'quic/quic_utils_test.cc',
- 'quic/quic_write_blocked_list_test.cc',
- 'quic/reliable_quic_stream_test.cc',
'sdch/sdch_owner_unittest.cc',
'server/http_connection_unittest.cc',
'server/http_server_response_info_unittest.cc',
@@ -1673,10 +1666,10 @@
'ssl/ssl_client_auth_cache_unittest.cc',
'ssl/ssl_config_service_unittest.cc',
'ssl/ssl_connection_status_flags_unittest.cc',
- 'test/gtest_util.h',
'test/embedded_test_server/embedded_test_server_unittest.cc',
'test/embedded_test_server/http_request_unittest.cc',
'test/embedded_test_server/http_response_unittest.cc',
+ 'test/gtest_util.h',
'test/python_utils_unittest.cc',
'test/run_all_unittests.cc',
'test/scoped_disable_exit_on_dfatal.cc',
@@ -1689,8 +1682,8 @@
'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',
- 'tools/dump_cache/url_utilities.h',
'tools/dump_cache/url_utilities.cc',
+ 'tools/dump_cache/url_utilities.h',
'tools/dump_cache/url_utilities_unittest.cc',
'tools/tld_cleanup/tld_cleanup_util_unittest.cc',
'udp/udp_socket_unittest.cc',
@@ -1725,6 +1718,9 @@
'websockets/websocket_handshake_challenge_test.cc',
'websockets/websocket_handshake_stream_create_helper_test.cc',
'websockets/websocket_inflater_test.cc',
+ 'websockets/websocket_stream_cookie_test.cc',
+ 'websockets/websocket_stream_create_test_base.cc',
+ 'websockets/websocket_stream_create_test_base.h',
'websockets/websocket_stream_test.cc',
'websockets/websocket_test_util.cc',
'websockets/websocket_test_util.h',
@@ -1755,18 +1751,18 @@
'tools/quic/test_tools/quic_client_peer.h',
'tools/quic/test_tools/quic_dispatcher_peer.cc',
'tools/quic/test_tools/quic_dispatcher_peer.h',
- 'tools/quic/test_tools/quic_in_memory_cache_peer.h',
'tools/quic/test_tools/quic_in_memory_cache_peer.cc',
+ 'tools/quic/test_tools/quic_in_memory_cache_peer.h',
'tools/quic/test_tools/quic_server_peer.cc',
'tools/quic/test_tools/quic_server_peer.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/server_thread.h',
'tools/quic/test_tools/server_thread.cc',
- 'tools/quic/test_tools/simple_client.h',
+ 'tools/quic/test_tools/server_thread.h',
'tools/quic/test_tools/simple_client.cc',
+ 'tools/quic/test_tools/simple_client.h',
],
'net_base_mac_ios_sources': [
'base/mac/url_conversions.h',
« no previous file with comments | « net/net.gyp ('k') | net/net_unittests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698