summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorsatorux <satorux@chromium.org>2015-02-12 11:10:26 -0800
committerCommit bot <commit-bot@chromium.org>2015-02-12 19:11:43 +0000
commitdd0840d3aa0e9d11c063b60442c4e08d911b6002 (patch)
tree2e0f8438cf0ee863cc16b304a647d6bcf8b38463 /net
parentfec4b0793f9d7eb6bef66f83687f10e6391dff62 (diff)
downloadchromium_src-dd0840d3aa0e9d11c063b60442c4e08d911b6002.zip
chromium_src-dd0840d3aa0e9d11c063b60442c4e08d911b6002.tar.gz
chromium_src-dd0840d3aa0e9d11c063b60442c4e08d911b6002.tar.bz2
Sort GYP files under net using tools/sort_sources.py
For tools/sort_sources.py to be useful, existing GYP files should be sorted. BUG=456014 TEST=everything should build as before Review URL: https://codereview.chromium.org/919463003 Cr-Commit-Position: refs/heads/master@{#316013}
Diffstat (limited to 'net')
-rw-r--r--net/net.gyp42
-rw-r--r--net/net.gypi118
2 files changed, 80 insertions, 80 deletions
diff --git a/net/net.gyp b/net/net.gyp
index cd381e0..8ee5289 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -144,8 +144,8 @@
'sources!': [
'http/http_auth_gssapi_posix.cc',
'http/http_auth_gssapi_posix.h',
- 'http/http_auth_handler_negotiate.h',
'http/http_auth_handler_negotiate.cc',
+ 'http/http_auth_handler_negotiate.h',
],
}],
['posix_avoid_mmap==1', {
@@ -172,12 +172,12 @@
'sources!': [
'base/directory_lister.cc',
'base/directory_lister.h',
+ 'url_request/file_protocol_handler.cc',
+ 'url_request/file_protocol_handler.h',
'url_request/url_request_file_dir_job.cc',
'url_request/url_request_file_dir_job.h',
'url_request/url_request_file_job.cc',
'url_request/url_request_file_job.h',
- 'url_request/file_protocol_handler.cc',
- 'url_request/file_protocol_handler.h',
],
}],
['disable_ftp_support==1', {
@@ -220,8 +220,8 @@
'cert/nss_cert_database_chromeos.h',
'cert/nss_profile_filter_chromeos.cc',
'cert/nss_profile_filter_chromeos.h',
- 'cert/sha256_legacy_support_nss_win.cc',
'cert/scoped_nss_types.h',
+ 'cert/sha256_legacy_support_nss_win.cc',
'cert/test_root_certs_nss.cc',
'cert/x509_certificate_nss.cc',
'cert/x509_util_nss.cc',
@@ -279,9 +279,9 @@
'socket/ssl_server_socket_openssl.h',
'socket/ssl_session_cache_openssl.cc',
'socket/ssl_session_cache_openssl.h',
+ 'ssl/openssl_platform_key.h',
'ssl/openssl_platform_key_mac.cc',
'ssl/openssl_platform_key_win.cc',
- 'ssl/openssl_platform_key.h',
'ssl/openssl_ssl_util.cc',
'ssl/openssl_ssl_util.h',
],
@@ -368,10 +368,10 @@
'sources!': [
'cert/cert_verify_proc_nss.cc',
'cert/cert_verify_proc_nss.h',
- 'ssl/client_cert_store_nss.cc',
- 'ssl/client_cert_store_nss.h',
'ssl/client_cert_store_chromeos.cc',
'ssl/client_cert_store_chromeos.h',
+ 'ssl/client_cert_store_nss.cc',
+ 'ssl/client_cert_store_nss.h',
],
}],
[ 'enable_websockets != 1', {
@@ -581,8 +581,8 @@
}],
[ 'use_nss != 1', {
'sources!': [
- 'ssl/client_cert_store_nss_unittest.cc',
'ssl/client_cert_store_chromeos_unittest.cc',
+ 'ssl/client_cert_store_nss_unittest.cc',
],
}],
[ 'use_openssl == 1', {
@@ -642,8 +642,8 @@
# TODO(bulach): Add equivalent tests when the underlying
# functionality is ported to OpenSSL.
'sources!': [
- 'cert/nss_cert_database_unittest.cc',
'cert/nss_cert_database_chromeos_unittest.cc',
+ 'cert/nss_cert_database_unittest.cc',
'cert/nss_profile_filter_chromeos_unittest.cc',
'cert/x509_util_nss_unittest.cc',
'quic/test_tools/crypto_test_utils_nss.cc',
@@ -702,8 +702,8 @@
],
}, { # else: !use_v8_in_net
'sources!': [
- 'proxy/proxy_resolver_v8_unittest.cc',
'proxy/proxy_resolver_v8_tracing_unittest.cc',
+ 'proxy/proxy_resolver_v8_unittest.cc',
],
},
],
@@ -954,10 +954,10 @@
'test/python_utils.h',
'test/spawned_test_server/base_test_server.cc',
'test/spawned_test_server/base_test_server.h',
- 'test/spawned_test_server/local_test_server_posix.cc',
- 'test/spawned_test_server/local_test_server_win.cc',
'test/spawned_test_server/local_test_server.cc',
'test/spawned_test_server/local_test_server.h',
+ 'test/spawned_test_server/local_test_server_posix.cc',
+ 'test/spawned_test_server/local_test_server_win.cc',
'test/spawned_test_server/remote_test_server.cc',
'test/spawned_test_server/remote_test_server.h',
'test/spawned_test_server/spawned_test_server.h',
@@ -1137,8 +1137,8 @@
'tools/dump_cache/simple_cache_dumper.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',
+ 'tools/dump_cache/url_utilities.h',
],
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
'msvs_disabled_warnings': [4267, ],
@@ -1424,20 +1424,20 @@
'sources': [
'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',
- 'tools/flip_server/acceptor_thread.h',
+ 'tools/dump_cache/url_utilities.h',
'tools/flip_server/acceptor_thread.cc',
+ 'tools/flip_server/acceptor_thread.h',
+ 'tools/flip_server/constants.h',
'tools/flip_server/create_listener.cc',
'tools/flip_server/create_listener.h',
- 'tools/flip_server/constants.h',
'tools/flip_server/flip_config.cc',
'tools/flip_server/flip_config.h',
'tools/flip_server/http_interface.cc',
'tools/flip_server/http_interface.h',
'tools/flip_server/loadtime_measurement.h',
- 'tools/flip_server/mem_cache.h',
'tools/flip_server/mem_cache.cc',
+ 'tools/flip_server/mem_cache.h',
'tools/flip_server/output_ordering.cc',
'tools/flip_server/output_ordering.h',
'tools/flip_server/ring_buffer.cc',
@@ -1445,10 +1445,10 @@
'tools/flip_server/sm_connection.cc',
'tools/flip_server/sm_connection.h',
'tools/flip_server/sm_interface.h',
- 'tools/flip_server/spdy_ssl.cc',
- 'tools/flip_server/spdy_ssl.h',
'tools/flip_server/spdy_interface.cc',
'tools/flip_server/spdy_interface.h',
+ 'tools/flip_server/spdy_ssl.cc',
+ 'tools/flip_server/spdy_ssl.h',
'tools/flip_server/spdy_util.cc',
'tools/flip_server/spdy_util.h',
'tools/flip_server/streamer_interface.cc',
@@ -1508,8 +1508,8 @@
'tools/quic/quic_client_session.h',
'tools/quic/quic_default_packet_writer.cc',
'tools/quic/quic_default_packet_writer.h',
- 'tools/quic/quic_dispatcher.h',
'tools/quic/quic_dispatcher.cc',
+ 'tools/quic/quic_dispatcher.h',
'tools/quic/quic_epoll_clock.cc',
'tools/quic/quic_epoll_clock.h',
'tools/quic/quic_epoll_connection_helper.cc',
@@ -1530,8 +1530,8 @@
'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/quic_time_wait_list_manager.h',
],
},
{
diff --git a/net/net.gypi b/net/net.gypi
index 1098be4..3c966e2 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',
@@ -274,6 +274,8 @@
'base/nss_memio.h',
'base/platform_mime_util.h',
# TODO(tc): gnome-vfs? xdgmime? /etc/mime.types?
+ 'base/layered_network_delegate.cc',
+ 'base/layered_network_delegate.h',
'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',
@@ -1237,10 +1237,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',
@@ -1279,14 +1279,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',
@@ -1300,7 +1301,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',
@@ -1486,6 +1486,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',
@@ -1539,48 +1581,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',
@@ -1668,10 +1668,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',
@@ -1684,8 +1684,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',
@@ -1753,18 +1753,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',