Merge from Chromium at DEPS revision r199464
This commit was generated by merge_to_master.py.
Change-Id: Ic3d1f97a4fb4edd1e6ed66a70b5040da1622b5a9
diff --git a/net/net.gyp b/net/net.gyp
index 8181589..02f8dda 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -138,6 +138,7 @@
'base/host_port_pair.h',
'base/io_buffer.cc',
'base/io_buffer.h',
+ 'base/iovec.h',
'base/ip_endpoint.cc',
'base/ip_endpoint.h',
'base/keygen_handler.cc',
@@ -711,6 +712,10 @@
'quic/crypto/aes_128_gcm_encrypter.h',
'quic/crypto/aes_128_gcm_encrypter_nss.cc',
'quic/crypto/aes_128_gcm_encrypter_openssl.cc',
+ 'quic/crypto/cert_compressor.cc',
+ 'quic/crypto/cert_compressor.h',
+ 'quic/crypto/common_cert_set.cc',
+ 'quic/crypto/common_cert_set.h',
'quic/crypto/crypto_framer.cc',
'quic/crypto/crypto_framer.h',
'quic/crypto/crypto_handshake.cc',
@@ -724,6 +729,7 @@
'quic/crypto/crypto_utils.h',
'quic/crypto/curve25519_key_exchange.cc',
'quic/crypto/curve25519_key_exchange.h',
+ 'quic/crypto/ephemeral_key_source.h',
'quic/crypto/key_exchange.h',
'quic/crypto/null_decrypter.cc',
'quic/crypto/null_decrypter.h',
@@ -788,6 +794,10 @@
'quic/quic_reliable_client_stream.h',
'quic/quic_session.cc',
'quic/quic_session.h',
+ 'quic/quic_spdy_compressor.cc',
+ 'quic/quic_spdy_compressor.h',
+ 'quic/quic_spdy_decompressor.cc',
+ 'quic/quic_spdy_decompressor.h',
'quic/quic_stats.cc',
'quic/quic_stats.h',
'quic/quic_stream_factory.cc',
@@ -800,6 +810,8 @@
'quic/quic_utils.h',
'quic/reliable_quic_stream.cc',
'quic/reliable_quic_stream.h',
+ 'quic/spdy_utils.cc',
+ 'quic/spdy_utils.h',
'socket/buffered_write_stream_socket.cc',
'socket/buffered_write_stream_socket.h',
'socket/client_socket_factory.cc',
@@ -1627,12 +1639,15 @@
'quic/congestion_control/tcp_receiver_test.cc',
'quic/crypto/aes_128_gcm_decrypter_test.cc',
'quic/crypto/aes_128_gcm_encrypter_test.cc',
+ 'quic/crypto/cert_compressor_test.cc',
+ 'quic/crypto/common_cert_set_test.cc',
'quic/crypto/crypto_framer_test.cc',
'quic/crypto/crypto_handshake_test.cc',
'quic/crypto/curve25519_key_exchange_test.cc',
'quic/crypto/null_decrypter_test.cc',
'quic/crypto/null_encrypter_test.cc',
'quic/crypto/p256_key_exchange_test.cc',
+ 'quic/crypto/proof_test.cc',
'quic/crypto/quic_random_test.cc',
'quic/crypto/strike_register_test.cc',
'quic/test_tools/crypto_test_utils.cc',
@@ -1680,6 +1695,8 @@
'quic/quic_protocol_test.cc',
'quic/quic_reliable_client_stream_test.cc',
'quic/quic_session_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',
@@ -1755,6 +1772,9 @@
'ssl/ssl_cipher_suite_names_unittest.cc',
'ssl/ssl_client_auth_cache_unittest.cc',
'ssl/ssl_config_service_unittest.cc',
+ '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/python_utils_unittest.cc',
'test/run_all_unittests.cc',
'test/test_certificate_data.h',
@@ -2117,30 +2137,38 @@
'proxy/proxy_config_service_common_unittest.h',
'socket/socket_test_util.cc',
'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',
- 'test/local_test_server.h',
+ 'test/embedded_test_server/embedded_test_server.cc',
+ 'test/embedded_test_server/embedded_test_server.h',
+ 'test/embedded_test_server/http_connection.cc',
+ 'test/embedded_test_server/http_connection.h',
+ 'test/embedded_test_server/http_request.cc',
+ 'test/embedded_test_server/http_request.h',
+ 'test/embedded_test_server/http_response.cc',
+ 'test/embedded_test_server/http_response.h',
'test/net_test_suite.cc',
'test/net_test_suite.h',
'test/python_utils.cc',
'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/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/remote_test_server.cc',
+ 'test/spawned_test_server/remote_test_server.h',
+ 'test/spawned_test_server/spawned_test_server.h',
+ 'test/spawned_test_server/spawner_communicator.cc',
+ 'test/spawned_test_server/spawner_communicator.h',
'url_request/test_url_fetcher_factory.cc',
'url_request/test_url_fetcher_factory.h',
'url_request/url_request_test_util.cc',
'url_request/url_request_test_util.h',
],
'conditions': [
- ['inside_chromium_build==1 and OS != "ios"', {
+ ['OS != "ios"', {
'dependencies': [
'../third_party/protobuf/protobuf.gyp:py_proto',
],
@@ -2169,10 +2197,10 @@
}],
['OS != "android"', {
'sources!': [
- 'test/remote_test_server.cc',
- 'test/remote_test_server.h',
- 'test/spawner_communicator.cc',
- 'test/spawner_communicator.h',
+ 'test/spawned_test_server/remote_test_server.cc',
+ 'test/spawned_test_server/remote_test_server.h',
+ 'test/spawned_test_server/spawner_communicator.cc',
+ 'test/spawned_test_server/spawner_communicator.h',
],
}],
['OS == "ios"', {
@@ -2652,6 +2680,7 @@
'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/quic_spdy_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',