Index: net/net.gypi |
diff --git a/net/net.gypi b/net/net.gypi |
index 1a37cc5a2f87c1f83f7795e889e93bbf9a05b9ee..ac8a3ce3c209c848d08a20c111acbd18dc46d012 100644 |
--- a/net/net.gypi |
+++ b/net/net.gypi |
@@ -28,10 +28,10 @@ |
'base/host_port_pair.h', |
'base/io_buffer.cc', |
'base/io_buffer.h', |
- 'base/ip_address_number.cc', |
- 'base/ip_address_number.h', |
'base/ip_address.cc', |
'base/ip_address.h', |
+ 'base/ip_address_number.cc', |
+ 'base/ip_address_number.h', |
'base/ip_endpoint.cc', |
'base/ip_endpoint.h', |
'base/load_timing_info.cc', |
@@ -101,12 +101,12 @@ |
'cert/internal/signature_algorithm.h', |
'cert/internal/signature_policy.cc', |
'cert/internal/signature_policy.h', |
+ 'cert/internal/verify_certificate_chain.cc', |
+ 'cert/internal/verify_certificate_chain.h', |
'cert/internal/verify_name_match.cc', |
'cert/internal/verify_name_match.h', |
'cert/internal/verify_signed_data.cc', |
'cert/internal/verify_signed_data.h', |
- 'cert/internal/verify_certificate_chain.cc', |
- 'cert/internal/verify_certificate_chain.h', |
'cert/pem_tokenizer.cc', |
'cert/pem_tokenizer.h', |
'cert/sha256_legacy_support_win.cc', |
@@ -135,10 +135,10 @@ |
'der/tag.h', |
'dns/dns_util.cc', |
'dns/dns_util.h', |
- 'http/http_auth_scheme.cc', |
- 'http/http_auth_scheme.h', |
'http/http_auth_challenge_tokenizer.cc', |
'http/http_auth_challenge_tokenizer.h', |
+ 'http/http_auth_scheme.cc', |
+ 'http/http_auth_scheme.h', |
'http/http_byte_range.cc', |
'http/http_byte_range.h', |
'http/http_log_util.cc', |
@@ -980,6 +980,8 @@ |
'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/cert_compressor.cc', |
+ 'quic/crypto/cert_compressor.h', |
'quic/crypto/chacha20_poly1305_decrypter_nss.cc', |
'quic/crypto/chacha20_poly1305_encrypter_nss.cc', |
'quic/crypto/channel_id_nss.cc', |
@@ -987,38 +989,36 @@ |
'quic/crypto/proof_source_chromium.h', |
'quic/crypto/proof_source_chromium_nss.cc', |
'quic/crypto/proof_source_chromium_openssl.cc', |
- 'quic/quic_chromium_client_session.cc', |
- 'quic/quic_chromium_client_session.h', |
- 'quic/quic_client_session_base.cc', |
- 'quic/quic_client_session_base.h', |
- 'quic/quic_headers_stream.cc', |
- 'quic/quic_headers_stream.h', |
- 'quic/quic_http_stream.cc', |
- 'quic/quic_http_stream.h', |
- 'quic/quic_http_utils.cc', |
- 'quic/quic_http_utils.h', |
- 'quic/quic_stream_factory.cc', |
- 'quic/quic_stream_factory.h', |
- 'quic/spdy_utils.cc', |
- 'quic/crypto/cert_compressor.cc', |
- 'quic/crypto/cert_compressor.h', |
'quic/crypto/quic_crypto_client_config.cc', |
'quic/crypto/quic_crypto_client_config.h', |
'quic/crypto/quic_crypto_server_config.cc', |
'quic/crypto/quic_crypto_server_config.h', |
'quic/network_connection.cc', |
'quic/network_connection.h', |
+ 'quic/quic_chromium_client_session.cc', |
+ 'quic/quic_chromium_client_session.h', |
+ 'quic/quic_client_session_base.cc', |
+ 'quic/quic_client_session_base.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_headers_stream.cc', |
+ 'quic/quic_headers_stream.h', |
+ 'quic/quic_http_stream.cc', |
+ 'quic/quic_http_stream.h', |
+ 'quic/quic_http_utils.cc', |
+ 'quic/quic_http_utils.h', |
'quic/quic_reliable_client_stream.cc', |
'quic/quic_reliable_client_stream.h', |
'quic/quic_spdy_session.cc', |
'quic/quic_spdy_session.h', |
'quic/quic_spdy_stream.cc', |
'quic/quic_spdy_stream.h', |
+ 'quic/quic_stream_factory.cc', |
+ 'quic/quic_stream_factory.h', |
+ 'quic/spdy_utils.cc', |
'quic/spdy_utils.h', |
'sdch/sdch_owner.cc', |
'sdch/sdch_owner.h', |
@@ -1102,6 +1102,7 @@ |
'spdy/hpack/hpack_output_stream.h', |
'spdy/hpack/hpack_static_table.cc', |
'spdy/hpack/hpack_static_table.h', |
+ 'spdy/priority_write_scheduler.h', |
'spdy/spdy_alt_svc_wire_format.cc', |
'spdy/spdy_alt_svc_wire_format.h', |
'spdy/spdy_bitmasks.h', |
@@ -1146,7 +1147,6 @@ |
'spdy/spdy_write_queue.cc', |
'spdy/spdy_write_queue.h', |
'spdy/write_blocked_list.h', |
- 'spdy/priority_write_scheduler.h', |
'ssl/client_cert_store.h', |
'ssl/client_cert_store_mac.cc', |
'ssl/client_cert_store_mac.h', |
@@ -1159,11 +1159,11 @@ |
'ssl/ssl_key_logger.cc', |
'ssl/ssl_key_logger.h', |
'ssl/ssl_platform_key.h', |
- 'ssl/ssl_platform_key_task_runner.cc', |
- 'ssl/ssl_platform_key_task_runner.h', |
'ssl/ssl_platform_key_android.cc', |
'ssl/ssl_platform_key_mac.cc', |
'ssl/ssl_platform_key_nss.cc', |
+ 'ssl/ssl_platform_key_task_runner.cc', |
+ 'ssl/ssl_platform_key_task_runner.h', |
'ssl/ssl_platform_key_win.cc', |
'ssl/threaded_ssl_private_key.cc', |
'ssl/threaded_ssl_private_key.h', |
@@ -1287,6 +1287,7 @@ |
'base/chunked_upload_data_stream_unittest.cc', |
'base/data_url_unittest.cc', |
'base/directory_lister_unittest.cc', |
+ 'base/directory_listing_unittest.cc', |
'base/elements_upload_data_stream_unittest.cc', |
'base/escape_unittest.cc', |
'base/expiring_cache_unittest.cc', |
@@ -1304,7 +1305,6 @@ |
'base/lookup_string_in_fixed_set_unittest.cc', |
'base/mime_sniffer_unittest.cc', |
'base/mime_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', |
@@ -1317,8 +1317,8 @@ |
'base/registry_controlled_domains/registry_controlled_domain_unittest.cc', |
'base/sdch_dictionary_unittest.cc', |
'base/sdch_manager_unittest.cc', |
- 'base/static_cookie_policy_unittest.cc', |
'base/stale_while_revalidate_experiment_domains_unittest.cc', |
+ 'base/static_cookie_policy_unittest.cc', |
'base/test_completion_callback_unittest.cc', |
'base/upload_bytes_element_reader_unittest.cc', |
'base/upload_file_element_reader_unittest.cc', |
@@ -1540,8 +1540,8 @@ |
'quic/crypto/quic_crypto_server_config_test.cc', |
'quic/crypto/quic_random_test.cc', |
'quic/crypto/strike_register_test.cc', |
- 'quic/interval_test.cc', |
'quic/interval_set_test.cc', |
+ 'quic/interval_test.cc', |
'quic/iovector_test.cc', |
'quic/network_connection_unittest.cc', |
'quic/p2p/quic_p2p_session_test.cc', |
@@ -1687,6 +1687,7 @@ |
'spdy/hpack/hpack_static_table_test.cc', |
'spdy/mock_spdy_framer_visitor.cc', |
'spdy/mock_spdy_framer_visitor.h', |
+ 'spdy/priority_write_scheduler_test.cc', |
'spdy/spdy_alt_svc_wire_format_test.cc', |
'spdy/spdy_buffer_unittest.cc', |
'spdy/spdy_frame_builder_test.cc', |
@@ -1715,7 +1716,6 @@ |
'spdy/spdy_test_utils.cc', |
'spdy/spdy_test_utils.h', |
'spdy/spdy_write_queue_unittest.cc', |
- 'spdy/priority_write_scheduler_test.cc', |
'spdy/write_blocked_list_test.cc', |
'ssl/channel_id_service_unittest.cc', |
'ssl/client_cert_store_mac_unittest.cc', |
@@ -1798,9 +1798,9 @@ |
'tools/quic/quic_in_memory_cache_test.cc', |
'tools/quic/quic_server_session_test.cc', |
'tools/quic/quic_server_test.cc', |
+ 'tools/quic/quic_simple_server_stream_test.cc', |
'tools/quic/quic_simple_server_test.cc', |
'tools/quic/quic_spdy_client_stream_test.cc', |
- 'tools/quic/quic_simple_server_stream_test.cc', |
'tools/quic/quic_time_wait_list_manager_test.cc', |
'tools/quic/spdy_balsa_utils_test.cc', |
'tools/quic/test_tools/http_message.cc', |
@@ -1840,6 +1840,8 @@ |
'net_file_support_sources': [ |
"base/directory_lister.cc", |
"base/directory_lister.h", |
+ "base/directory_listing.cc", |
+ "base/directory_listing.h", |
"url_request/file_protocol_handler.cc", |
"url_request/file_protocol_handler.h", |
"url_request/url_request_file_dir_job.cc", |