Merge from Chromium at DEPS revision 228962
This commit was generated by merge_to_master.py.
Change-Id: I23bd7d7766f213fd52f28ae5e1ecc6ae9df905ea
diff --git a/net/net.gyp b/net/net.gyp
index 3f1d793..451e2ac 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -207,6 +207,7 @@
'base/rand_callback.h',
'base/registry_controlled_domains/registry_controlled_domain.cc',
'base/registry_controlled_domains/registry_controlled_domain.h',
+ 'base/request_priority.cc',
'base/request_priority.h',
'base/sdch_filter.cc',
'base/sdch_filter.h',
@@ -1109,8 +1110,10 @@
'websockets/websocket_basic_stream.h',
'websockets/websocket_channel.cc',
'websockets/websocket_channel.h',
- 'websockets/websocket_deflater.h',
+ 'websockets/websocket_deflate_stream.cc',
+ 'websockets/websocket_deflate_stream.h',
'websockets/websocket_deflater.cc',
+ 'websockets/websocket_deflater.h',
'websockets/websocket_errors.cc',
'websockets/websocket_errors.h',
'websockets/websocket_extension.cc',
@@ -1125,6 +1128,8 @@
'websockets/websocket_handshake_constants.h',
'websockets/websocket_handshake_handler.cc',
'websockets/websocket_handshake_handler.h',
+ 'websockets/websocket_inflater.cc',
+ 'websockets/websocket_inflater.h',
'websockets/websocket_job.cc',
'websockets/websocket_job.h',
'websockets/websocket_mux.h',
@@ -1889,6 +1894,7 @@
'url_request/view_cache_helper_unittest.cc',
'websockets/websocket_basic_stream_test.cc',
'websockets/websocket_channel_test.cc',
+ 'websockets/websocket_deflate_stream_test.cc',
'websockets/websocket_deflater_test.cc',
'websockets/websocket_errors_test.cc',
'websockets/websocket_extension_parser_test.cc',
@@ -1896,26 +1902,29 @@
'websockets/websocket_frame_test.cc',
'websockets/websocket_handshake_handler_test.cc',
'websockets/websocket_handshake_handler_spdy_test.cc',
+ 'websockets/websocket_inflater_test.cc',
'websockets/websocket_job_test.cc',
'websockets/websocket_net_log_params_test.cc',
+ 'websockets/websocket_test_util.cc',
+ 'websockets/websocket_test_util.h',
'websockets/websocket_throttle_test.cc',
],
'conditions': [
['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
'dependencies': [
- 'quic_library',
- 'flip_in_mem_edsm_server_library',
- 'flip_balsa_and_epoll_library',
+ 'balsa',
+ 'epoll_server',
+ 'flip_in_mem_edsm_server_base',
+ 'quic_base',
],
'sources': [
- 'tools/flip_server/balsa_frame_test.cc',
- 'tools/flip_server/balsa_headers_test.cc',
+ 'quic/quic_end_to_end_unittest.cc',
+ 'tools/balsa/balsa_frame_test.cc',
+ 'tools/balsa/balsa_headers_test.cc',
'tools/flip_server/flip_test_utils.cc',
'tools/flip_server/flip_test_utils.h',
'tools/flip_server/http_interface_test.cc',
'tools/flip_server/mem_cache_test.cc',
- 'tools/flip_server/simple_buffer.cc',
- 'tools/flip_server/simple_buffer.h',
'tools/flip_server/spdy_interface_test.cc',
'tools/quic/end_to_end_test.cc',
'tools/quic/quic_client_session_test.cc',
@@ -1939,6 +1948,8 @@
'tools/quic/test_tools/quic_client_peer.h',
'tools/quic/test_tools/quic_epoll_connection_helper_peer.cc',
'tools/quic/test_tools/quic_epoll_connection_helper_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_test_client.cc',
'tools/quic/test_tools/quic_test_client.h',
'tools/quic/test_tools/quic_test_utils.cc',
@@ -2645,32 +2656,44 @@
['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
'targets': [
{
- 'target_name': 'flip_balsa_and_epoll_library',
+ 'target_name': 'balsa',
'type': 'static_library',
'dependencies': [
'../base/base.gyp:base',
'net',
],
'sources': [
- 'tools/flip_server/balsa_enums.h',
- 'tools/flip_server/balsa_frame.cc',
- 'tools/flip_server/balsa_frame.h',
- 'tools/flip_server/balsa_headers.cc',
- 'tools/flip_server/balsa_headers.h',
- 'tools/flip_server/balsa_headers_token_utils.cc',
- 'tools/flip_server/balsa_headers_token_utils.h',
- 'tools/flip_server/balsa_visitor_interface.h',
- 'tools/flip_server/constants.h',
- 'tools/flip_server/epoll_server.cc',
- 'tools/flip_server/epoll_server.h',
- 'tools/flip_server/http_message_constants.cc',
- 'tools/flip_server/http_message_constants.h',
- 'tools/flip_server/split.h',
- 'tools/flip_server/split.cc',
+ 'tools/balsa/balsa_enums.h',
+ 'tools/balsa/balsa_frame.cc',
+ 'tools/balsa/balsa_frame.h',
+ 'tools/balsa/balsa_headers.cc',
+ 'tools/balsa/balsa_headers.h',
+ 'tools/balsa/balsa_headers_token_utils.cc',
+ 'tools/balsa/balsa_headers_token_utils.h',
+ 'tools/balsa/balsa_visitor_interface.h',
+ 'tools/balsa/http_message_constants.cc',
+ 'tools/balsa/http_message_constants.h',
+ 'tools/balsa/noop_balsa_visitor.h',
+ 'tools/balsa/simple_buffer.cc',
+ 'tools/balsa/simple_buffer.h',
+ 'tools/balsa/split.cc',
+ 'tools/balsa/split.h',
],
},
{
- 'target_name': 'flip_in_mem_edsm_server_library',
+ 'target_name': 'epoll_server',
+ 'type': 'static_library',
+ 'dependencies': [
+ '../base/base.gyp:base',
+ 'net',
+ ],
+ 'sources': [
+ 'tools/epoll_server/epoll_server.cc',
+ 'tools/epoll_server/epoll_server.h',
+ ],
+ },
+ {
+ 'target_name': 'flip_in_mem_edsm_server_base',
'type': 'static_library',
'cflags': [
'-Wno-deprecated',
@@ -2678,7 +2701,8 @@
'dependencies': [
'../base/base.gyp:base',
'../third_party/openssl/openssl.gyp:openssl',
- 'flip_balsa_and_epoll_library',
+ 'balsa',
+ 'epoll_server',
'net',
],
'sources': [
@@ -2688,9 +2712,9 @@
'tools/dump_cache/url_utilities.cc',
'tools/flip_server/acceptor_thread.h',
'tools/flip_server/acceptor_thread.cc',
- 'tools/flip_server/buffer_interface.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',
@@ -2702,8 +2726,6 @@
'tools/flip_server/output_ordering.h',
'tools/flip_server/ring_buffer.cc',
'tools/flip_server/ring_buffer.h',
- 'tools/flip_server/simple_buffer.cc',
- 'tools/flip_server/simple_buffer.h',
'tools/flip_server/sm_connection.cc',
'tools/flip_server/sm_connection.h',
'tools/flip_server/sm_interface.h',
@@ -2726,8 +2748,7 @@
],
'dependencies': [
'../base/base.gyp:base',
- 'flip_balsa_and_epoll_library',
- 'flip_in_mem_edsm_server_library',
+ 'flip_in_mem_edsm_server_base',
'net',
],
'sources': [
@@ -2735,7 +2756,7 @@
],
},
{
- 'target_name': 'quic_library',
+ 'target_name': 'quic_base',
'type': 'static_library',
'dependencies': [
'../base/base.gyp:base',
@@ -2743,7 +2764,8 @@
'../crypto/crypto.gyp:crypto',
'../third_party/openssl/openssl.gyp:openssl',
'../url/url.gyp:url_lib',
- 'flip_balsa_and_epoll_library',
+ 'balsa',
+ 'epoll_server',
'net',
],
'sources': [
@@ -2787,7 +2809,7 @@
'../base/base.gyp:base',
'../third_party/openssl/openssl.gyp:openssl',
'net',
- 'quic_library',
+ 'quic_base',
],
'sources': [
'tools/quic/quic_client_bin.cc',
@@ -2800,7 +2822,7 @@
'../base/base.gyp:base',
'../third_party/openssl/openssl.gyp:openssl',
'net',
- 'quic_library',
+ 'quic_base',
],
'sources': [
'tools/quic/quic_server_bin.cc',