Merge from Chromium at DEPS revision 222756
This commit was generated by merge_to_master.py.
Change-Id: I40d7f32f195f328f005f230ea80d07092d48040e
diff --git a/net/net.gyp b/net/net.gyp
index a189432..dae94a2 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -360,6 +360,7 @@
'disk_cache/in_flight_backend_io.h',
'disk_cache/in_flight_io.cc',
'disk_cache/in_flight_io.h',
+ 'disk_cache/mapped_file.cc',
'disk_cache/mapped_file.h',
'disk_cache/mapped_file_posix.cc',
'disk_cache/mapped_file_avoid_mmap_posix.cc',
@@ -395,6 +396,7 @@
'disk_cache/simple/simple_entry_impl.h',
'disk_cache/simple/simple_entry_operation.cc',
'disk_cache/simple/simple_entry_operation.h',
+ 'disk_cache/simple/simple_histogram_macros.h' ,
'disk_cache/simple/simple_index.cc',
'disk_cache/simple/simple_index.h',
'disk_cache/simple/simple_index_file.cc',
@@ -783,6 +785,8 @@
'quic/crypto/strike_register.h',
'quic/crypto/source_address_token.cc',
'quic/crypto/source_address_token.h',
+ 'quic/quic_ack_notifier.cc',
+ 'quic/quic_ack_notifier.h',
'quic/quic_alarm.cc',
'quic/quic_alarm.h',
'quic/quic_bandwidth.cc',
@@ -907,11 +911,13 @@
'socket/tcp_client_socket_win.h',
'socket/tcp_listen_socket.cc',
'socket/tcp_listen_socket.h',
+ 'socket/tcp_server_socket.cc',
'socket/tcp_server_socket.h',
- 'socket/tcp_server_socket_libevent.cc',
- 'socket/tcp_server_socket_libevent.h',
- 'socket/tcp_server_socket_win.cc',
- 'socket/tcp_server_socket_win.h',
+ 'socket/tcp_socket.h',
+ 'socket/tcp_socket_libevent.cc',
+ 'socket/tcp_socket_libevent.h',
+ 'socket/tcp_socket_win.cc',
+ 'socket/tcp_socket_win.h',
'socket/transport_client_socket_pool.cc',
'socket/transport_client_socket_pool.h',
'socket/unix_domain_socket_posix.cc',
@@ -1089,14 +1095,20 @@
'url_request/url_request_throttler_manager.h',
'url_request/view_cache_helper.cc',
'url_request/view_cache_helper.h',
+ 'websockets/websocket_basic_stream.cc',
+ 'websockets/websocket_basic_stream.h',
'websockets/websocket_channel.cc',
'websockets/websocket_channel.h',
+ 'websockets/websocket_deflater.h',
+ 'websockets/websocket_deflater.cc',
'websockets/websocket_errors.cc',
'websockets/websocket_errors.h',
'websockets/websocket_frame.cc',
'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_handler.cc',
'websockets/websocket_handshake_handler.h',
'websockets/websocket_job.cc',
@@ -1364,8 +1376,8 @@
'http/http_auth_handler_ntlm_portable.cc',
'socket/tcp_client_socket_libevent.cc',
'socket/tcp_client_socket_libevent.h',
- 'socket/tcp_server_socket_libevent.cc',
- 'socket/tcp_server_socket_libevent.h',
+ 'socket/tcp_socket_libevent.cc',
+ 'socket/tcp_socket_libevent.h',
'ssl/client_cert_store_impl_nss.cc',
'udp/udp_socket_libevent.cc',
'udp/udp_socket_libevent.h',
@@ -1740,6 +1752,7 @@
'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_alarm_test.cc',
'quic/quic_bandwidth_test.cc',
'quic/quic_client_session_test.cc',
@@ -1787,6 +1800,7 @@
'socket/tcp_listen_socket_unittest.cc',
'socket/tcp_listen_socket_unittest.h',
'socket/tcp_server_socket_unittest.cc',
+ 'socket/tcp_socket_unittest.cc',
'socket/transport_client_socket_pool_unittest.cc',
'socket/transport_client_socket_unittest.cc',
'socket/unix_domain_socket_posix_unittest.cc',
@@ -1857,15 +1871,17 @@
'url_request/url_request_throttler_unittest.cc',
'url_request/url_request_unittest.cc',
'url_request/view_cache_helper_unittest.cc',
+ 'websockets/websocket_basic_stream_test.cc',
'websockets/websocket_channel_test.cc',
- 'websockets/websocket_errors_unittest.cc',
- 'websockets/websocket_frame_parser_unittest.cc',
- 'websockets/websocket_frame_unittest.cc',
- 'websockets/websocket_handshake_handler_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',
+ 'websockets/websocket_deflater_test.cc',
+ 'websockets/websocket_errors_test.cc',
+ 'websockets/websocket_frame_parser_test.cc',
+ 'websockets/websocket_frame_test.cc',
+ 'websockets/websocket_handshake_handler_test.cc',
+ 'websockets/websocket_handshake_handler_spdy_test.cc',
+ 'websockets/websocket_job_test.cc',
+ 'websockets/websocket_net_log_params_test.cc',
+ 'websockets/websocket_throttle_test.cc',
],
'conditions': [
['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {