Merge from Chromium at DEPS revision r210036
This commit was generated by merge_to_master.py.
Change-Id: Ib0e33a83ad5dfa541481e83d7acfc6970e68f471
diff --git a/net/net.gyp b/net/net.gyp
index 5a0bc49..5d5c131 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -166,6 +166,8 @@
'base/net_export.h',
'base/net_log.cc',
'base/net_log.h',
+ 'base/net_log_logger.cc',
+ 'base/net_log_logger.h',
'base/net_log_event_type_list.h',
'base/net_log_source_type_list.h',
'base/net_module.cc',
@@ -605,6 +607,8 @@
'http/partial_data.h',
'http/proxy_client_socket.h',
'http/proxy_client_socket.cc',
+ 'http/proxy_connect_redirect_http_stream.h',
+ 'http/proxy_connect_redirect_http_stream.cc',
'http/transport_security_state.cc',
'http/transport_security_state.h',
'http/transport_security_state_static.h',
@@ -754,6 +758,8 @@
'quic/crypto/p256_key_exchange_nss.cc',
'quic/crypto/p256_key_exchange_openssl.cc',
'quic/crypto/proof_source.h',
+ 'quic/crypto/proof_verifier_chromium.cc',
+ 'quic/crypto/proof_verifier_chromium.h',
'quic/crypto/quic_decrypter.cc',
'quic/crypto/quic_decrypter.h',
'quic/crypto/quic_encrypter.cc',
@@ -1077,7 +1083,9 @@
'websockets/websocket_job.h',
'websockets/websocket_net_log_params.cc',
'websockets/websocket_net_log_params.h',
+ 'websockets/websocket_stream.cc',
'websockets/websocket_stream.h',
+ 'websockets/websocket_stream_base.h',
'websockets/websocket_throttle.cc',
'websockets/websocket_throttle.h',
],
@@ -1413,11 +1421,6 @@
'include_dirs': [
'../third_party/openssl',
],
- }, { # else OS != "android"
- 'defines': [
- # These are the features Android doesn't support.
- 'ENABLE_MEDIA_CODEC_THEORA',
- ],
},
],
],
@@ -1492,6 +1495,7 @@
'base/mime_util_unittest.cc',
'base/mock_filter_context.cc',
'base/mock_filter_context.h',
+ 'base/net_log_logger_unittest.cc',
'base/net_log_unittest.cc',
'base/net_log_unittest.h',
'base/net_util_unittest.cc',
@@ -1512,6 +1516,7 @@
'cert/multi_threaded_cert_verifier_unittest.cc',
'cert/nss_cert_database_unittest.cc',
'cert/pem_tokenizer_unittest.cc',
+ 'cert/test_root_certs_unittest.cc',
'cert/x509_certificate_unittest.cc',
'cert/x509_cert_types_unittest.cc',
'cert/x509_util_unittest.cc',
@@ -1596,8 +1601,7 @@
'http/http_pipelined_host_test_util.cc',
'http/http_pipelined_host_test_util.h',
'http/http_pipelined_network_transaction_unittest.cc',
- 'http/http_proxy_client_socket_pool_spdy2_unittest.cc',
- 'http/http_proxy_client_socket_pool_spdy3_unittest.cc',
+ 'http/http_proxy_client_socket_pool_unittest.cc',
'http/http_request_headers_unittest.cc',
'http/http_response_body_drainer_unittest.cc',
'http/http_response_headers_unittest.cc',
@@ -1678,6 +1682,7 @@
'quic/crypto/strike_register_test.cc',
'quic/test_tools/crypto_test_utils.cc',
'quic/test_tools/crypto_test_utils.h',
+ 'quic/test_tools/crypto_test_utils_chromium.cc',
'quic/test_tools/crypto_test_utils_nss.cc',
'quic/test_tools/crypto_test_utils_openssl.cc',
'quic/test_tools/mock_clock.cc',
@@ -1754,8 +1759,7 @@
'socket/unix_domain_socket_posix_unittest.cc',
'socket_stream/socket_stream_metrics_unittest.cc',
'socket_stream/socket_stream_unittest.cc',
- 'spdy/buffered_spdy_framer_spdy3_unittest.cc',
- 'spdy/buffered_spdy_framer_spdy2_unittest.cc',
+ 'spdy/buffered_spdy_framer_unittest.cc',
'spdy/spdy_credential_builder_unittest.cc',
'spdy/spdy_buffer_unittest.cc',
'spdy/spdy_credential_state_unittest.cc',
@@ -1778,18 +1782,11 @@
'spdy/spdy_stream_unittest.cc',
'spdy/spdy_test_util_common.cc',
'spdy/spdy_test_util_common.h',
- 'spdy/spdy_test_util_spdy3.cc',
- 'spdy/spdy_test_util_spdy3.h',
- 'spdy/spdy_test_util_spdy2.cc',
- 'spdy/spdy_test_util_spdy2.h',
'spdy/spdy_test_utils.cc',
'spdy/spdy_test_utils.h',
- 'spdy/spdy_websocket_stream_spdy2_unittest.cc',
- 'spdy/spdy_websocket_stream_spdy3_unittest.cc',
- 'spdy/spdy_websocket_test_util_spdy2.cc',
- 'spdy/spdy_websocket_test_util_spdy2.h',
- 'spdy/spdy_websocket_test_util_spdy3.cc',
- 'spdy/spdy_websocket_test_util_spdy3.h',
+ 'spdy/spdy_websocket_stream_unittest.cc',
+ 'spdy/spdy_websocket_test_util.cc',
+ 'spdy/spdy_websocket_test_util.h',
'spdy/spdy_write_queue_unittest.cc',
'ssl/client_cert_store_impl_unittest.cc',
'ssl/default_server_bound_cert_store_unittest.cc',
@@ -1829,10 +1826,8 @@
'websockets/websocket_frame_parser_unittest.cc',
'websockets/websocket_frame_unittest.cc',
'websockets/websocket_handshake_handler_unittest.cc',
- 'websockets/websocket_handshake_handler_spdy2_unittest.cc',
- 'websockets/websocket_handshake_handler_spdy3_unittest.cc',
- 'websockets/websocket_job_spdy2_unittest.cc',
- 'websockets/websocket_job_spdy3_unittest.cc',
+ 'websockets/websocket_handshake_handler_spdy_unittest.cc',
+ 'websockets/websocket_job_unittest.cc',
'websockets/websocket_net_log_params_unittest.cc',
'websockets/websocket_throttle_unittest.cc',
],
@@ -1922,7 +1917,7 @@
'sources/': [
['exclude', '^socket_stream/'],
['exclude', '^websockets/'],
- ['exclude', '^spdy/spdy_websocket_stream_spdy._unittest\\.cc$'],
+ ['exclude', '^spdy/spdy_websocket_stream_unittest\\.cc$'],
],
}],
[ 'disable_ftp_support==1', {
@@ -2126,6 +2121,7 @@
'../base/base.gyp:test_support_base',
'../net/tools/tld_cleanup/tld_cleanup.gyp:tld_cleanup_util',
'../testing/gtest.gyp:gtest',
+ '../testing/gmock.gyp:gmock',
'../url/url.gyp:url_lib',
'net',
],
@@ -2133,6 +2129,7 @@
'../base/base.gyp:base',
'../base/base.gyp:test_support_base',
'../testing/gtest.gyp:gtest',
+ '../testing/gmock.gyp:gmock',
],
'sources': [
'base/capturing_net_log.cc',
@@ -2163,6 +2160,8 @@
'dns/dns_test_util.h',
'dns/mock_host_resolver.cc',
'dns/mock_host_resolver.h',
+ 'dns/mock_mdns_socket_factory.cc',
+ 'dns/mock_mdns_socket_factory.h',
'proxy/mock_proxy_resolver.cc',
'proxy/mock_proxy_resolver.h',
'proxy/mock_proxy_script_fetcher.cc',
@@ -2248,6 +2247,12 @@
],
},
],
+ [ 'enable_mdns != 1', {
+ 'sources!' : [
+ 'dns/mock_mdns_socket_factory.cc',
+ 'dns/mock_mdns_socket_factory.h'
+ ]
+ }],
],
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
'msvs_disabled_warnings': [4267, ],
@@ -2682,6 +2687,7 @@
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'net',
+ 'net_test_support',
'quic_library',
],
'sources': [
@@ -2689,6 +2695,7 @@
'quic/test_tools/quic_session_peer.h',
'quic/test_tools/crypto_test_utils.cc',
'quic/test_tools/crypto_test_utils.h',
+ 'quic/test_tools/crypto_test_utils_chromium.cc',
'quic/test_tools/crypto_test_utils_nss.cc',
'quic/test_tools/crypto_test_utils_openssl.cc',
'quic/test_tools/mock_clock.cc',
@@ -2714,6 +2721,7 @@
'tools/quic/quic_dispatcher_test.cc',
'tools/quic/quic_epoll_clock_test.cc',
'tools/quic/quic_epoll_connection_helper_test.cc',
+ 'tools/quic/quic_in_memory_cache_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',