Index: net/BUILD.gn |
diff --git a/net/BUILD.gn b/net/BUILD.gn |
index db6cb35edc7ea0d3ee2586abce1c4169288fb57f..3af923d56e54617c87e74f7c87f25d0ca202ce5d 100644 |
--- a/net/BUILD.gn |
+++ b/net/BUILD.gn |
@@ -1519,46 +1519,99 @@ component("net") { |
"socket/websocket_transport_client_socket_pool.h", |
"socket/websocket_transport_connect_sub_job.cc", |
"socket/websocket_transport_connect_sub_job.h", |
- "spdy/bidirectional_stream_spdy_impl.cc", |
- "spdy/bidirectional_stream_spdy_impl.h", |
- "spdy/buffered_spdy_framer.cc", |
- "spdy/buffered_spdy_framer.h", |
- "spdy/fuzzing/hpack_fuzz_util.cc", |
- "spdy/fuzzing/hpack_fuzz_util.h", |
- "spdy/header_coalescer.cc", |
- "spdy/header_coalescer.h", |
- "spdy/hpack/hpack_constants.cc", |
- "spdy/hpack/hpack_constants.h", |
- "spdy/hpack/hpack_decoder.cc", |
- "spdy/hpack/hpack_decoder.h", |
- "spdy/hpack/hpack_decoder3.cc", |
- "spdy/hpack/hpack_decoder3.h", |
- "spdy/hpack/hpack_decoder_interface.h", |
- "spdy/hpack/hpack_encoder.cc", |
- "spdy/hpack/hpack_encoder.h", |
- "spdy/hpack/hpack_entry.cc", |
- "spdy/hpack/hpack_entry.h", |
- "spdy/hpack/hpack_header_table.cc", |
- "spdy/hpack/hpack_header_table.h", |
- "spdy/hpack/hpack_huffman_decoder.cc", |
- "spdy/hpack/hpack_huffman_decoder.h", |
- "spdy/hpack/hpack_huffman_table.cc", |
- "spdy/hpack/hpack_huffman_table.h", |
- "spdy/hpack/hpack_input_stream.cc", |
- "spdy/hpack/hpack_input_stream.h", |
- "spdy/hpack/hpack_output_stream.cc", |
- "spdy/hpack/hpack_output_stream.h", |
- "spdy/hpack/hpack_static_table.cc", |
- "spdy/hpack/hpack_static_table.h", |
- "spdy/http2_frame_decoder_adapter.cc", |
- "spdy/http2_frame_decoder_adapter.h", |
- "spdy/http2_priority_dependencies.cc", |
- "spdy/http2_priority_dependencies.h", |
- "spdy/lifo_write_scheduler.h", |
- "spdy/multiplexed_http_stream.cc", |
- "spdy/multiplexed_http_stream.h", |
- "spdy/multiplexed_session.cc", |
- "spdy/multiplexed_session.h", |
+ "spdy/chromium/bidirectional_stream_spdy_impl.cc", |
+ "spdy/chromium/bidirectional_stream_spdy_impl.h", |
+ "spdy/chromium/buffered_spdy_framer.cc", |
+ "spdy/chromium/buffered_spdy_framer.h", |
+ "spdy/chromium/header_coalescer.cc", |
+ "spdy/chromium/header_coalescer.h", |
+ "spdy/chromium/http2_priority_dependencies.cc", |
+ "spdy/chromium/http2_priority_dependencies.h", |
+ "spdy/chromium/multiplexed_http_stream.cc", |
+ "spdy/chromium/multiplexed_http_stream.h", |
+ "spdy/chromium/multiplexed_session.cc", |
+ "spdy/chromium/multiplexed_session.h", |
+ "spdy/chromium/server_push_delegate.h", |
+ "spdy/chromium/spdy_buffer.cc", |
+ "spdy/chromium/spdy_buffer.h", |
+ "spdy/chromium/spdy_buffer_producer.cc", |
+ "spdy/chromium/spdy_buffer_producer.h", |
+ "spdy/chromium/spdy_flags.cc", |
+ "spdy/chromium/spdy_flags.h", |
+ "spdy/chromium/spdy_http_stream.cc", |
+ "spdy/chromium/spdy_http_stream.h", |
+ "spdy/chromium/spdy_http_utils.cc", |
+ "spdy/chromium/spdy_http_utils.h", |
+ "spdy/chromium/spdy_log_util.cc", |
+ "spdy/chromium/spdy_log_util.h", |
+ "spdy/chromium/spdy_proxy_client_socket.cc", |
+ "spdy/chromium/spdy_proxy_client_socket.h", |
+ "spdy/chromium/spdy_read_queue.cc", |
+ "spdy/chromium/spdy_read_queue.h", |
+ "spdy/chromium/spdy_session.cc", |
+ "spdy/chromium/spdy_session.h", |
+ "spdy/chromium/spdy_session_key.cc", |
+ "spdy/chromium/spdy_session_key.h", |
+ "spdy/chromium/spdy_session_pool.cc", |
+ "spdy/chromium/spdy_session_pool.h", |
+ "spdy/chromium/spdy_stream.cc", |
+ "spdy/chromium/spdy_stream.h", |
+ "spdy/chromium/spdy_write_queue.cc", |
+ "spdy/chromium/spdy_write_queue.h", |
+ "spdy/core/fuzzing/hpack_fuzz_util.cc", |
+ "spdy/core/fuzzing/hpack_fuzz_util.h", |
+ "spdy/core/hpack/hpack_constants.cc", |
+ "spdy/core/hpack/hpack_constants.h", |
+ "spdy/core/hpack/hpack_decoder.cc", |
+ "spdy/core/hpack/hpack_decoder.h", |
+ "spdy/core/hpack/hpack_decoder3.cc", |
+ "spdy/core/hpack/hpack_decoder3.h", |
+ "spdy/core/hpack/hpack_decoder_interface.h", |
+ "spdy/core/hpack/hpack_encoder.cc", |
+ "spdy/core/hpack/hpack_encoder.h", |
+ "spdy/core/hpack/hpack_entry.cc", |
+ "spdy/core/hpack/hpack_entry.h", |
+ "spdy/core/hpack/hpack_header_table.cc", |
+ "spdy/core/hpack/hpack_header_table.h", |
+ "spdy/core/hpack/hpack_huffman_decoder.cc", |
+ "spdy/core/hpack/hpack_huffman_decoder.h", |
+ "spdy/core/hpack/hpack_huffman_table.cc", |
+ "spdy/core/hpack/hpack_huffman_table.h", |
+ "spdy/core/hpack/hpack_input_stream.cc", |
+ "spdy/core/hpack/hpack_input_stream.h", |
+ "spdy/core/hpack/hpack_output_stream.cc", |
+ "spdy/core/hpack/hpack_output_stream.h", |
+ "spdy/core/hpack/hpack_static_table.cc", |
+ "spdy/core/hpack/hpack_static_table.h", |
+ "spdy/core/http2_frame_decoder_adapter.cc", |
+ "spdy/core/http2_frame_decoder_adapter.h", |
+ "spdy/core/lifo_write_scheduler.h", |
+ "spdy/core/priority_write_scheduler.h", |
+ "spdy/core/spdy_alt_svc_wire_format.cc", |
+ "spdy/core/spdy_alt_svc_wire_format.h", |
+ "spdy/core/spdy_bitmasks.h", |
+ "spdy/core/spdy_bug_tracker.h", |
+ "spdy/core/spdy_frame_builder.cc", |
+ "spdy/core/spdy_frame_builder.h", |
+ "spdy/core/spdy_frame_reader.cc", |
+ "spdy/core/spdy_frame_reader.h", |
+ "spdy/core/spdy_framer.cc", |
+ "spdy/core/spdy_framer.h", |
+ "spdy/core/spdy_framer_decoder_adapter.cc", |
+ "spdy/core/spdy_framer_decoder_adapter.h", |
+ "spdy/core/spdy_header_block.cc", |
+ "spdy/core/spdy_header_block.h", |
+ "spdy/core/spdy_header_indexing.cc", |
+ "spdy/core/spdy_header_indexing.h", |
+ "spdy/core/spdy_headers_handler_interface.h", |
+ "spdy/core/spdy_pinnable_buffer_piece.cc", |
+ "spdy/core/spdy_pinnable_buffer_piece.h", |
+ "spdy/core/spdy_prefixed_buffer_reader.cc", |
+ "spdy/core/spdy_prefixed_buffer_reader.h", |
+ "spdy/core/spdy_protocol.cc", |
+ "spdy/core/spdy_protocol.h", |
+ "spdy/core/write_scheduler.h", |
+ "spdy/core/zero_copy_output_buffer.h", |
"spdy/platform/api/spdy_estimate_memory_usage.h", |
"spdy/platform/api/spdy_string.h", |
"spdy/platform/api/spdy_string_piece.h", |
@@ -1567,59 +1620,6 @@ component("net") { |
"spdy/platform/impl/spdy_string_impl.h", |
"spdy/platform/impl/spdy_string_piece_impl.h", |
"spdy/platform/impl/spdy_string_utils_impl.h", |
- "spdy/priority_write_scheduler.h", |
- "spdy/server_push_delegate.h", |
- "spdy/spdy_alt_svc_wire_format.cc", |
- "spdy/spdy_alt_svc_wire_format.h", |
- "spdy/spdy_bitmasks.h", |
- "spdy/spdy_buffer.cc", |
- "spdy/spdy_buffer.h", |
- "spdy/spdy_buffer_producer.cc", |
- "spdy/spdy_buffer_producer.h", |
- "spdy/spdy_bug_tracker.h", |
- "spdy/spdy_flags.cc", |
- "spdy/spdy_flags.h", |
- "spdy/spdy_frame_builder.cc", |
- "spdy/spdy_frame_builder.h", |
- "spdy/spdy_frame_reader.cc", |
- "spdy/spdy_frame_reader.h", |
- "spdy/spdy_framer.cc", |
- "spdy/spdy_framer.h", |
- "spdy/spdy_framer_decoder_adapter.cc", |
- "spdy/spdy_framer_decoder_adapter.h", |
- "spdy/spdy_header_block.cc", |
- "spdy/spdy_header_block.h", |
- "spdy/spdy_header_indexing.cc", |
- "spdy/spdy_header_indexing.h", |
- "spdy/spdy_headers_handler_interface.h", |
- "spdy/spdy_http_stream.cc", |
- "spdy/spdy_http_stream.h", |
- "spdy/spdy_http_utils.cc", |
- "spdy/spdy_http_utils.h", |
- "spdy/spdy_log_util.cc", |
- "spdy/spdy_log_util.h", |
- "spdy/spdy_pinnable_buffer_piece.cc", |
- "spdy/spdy_pinnable_buffer_piece.h", |
- "spdy/spdy_prefixed_buffer_reader.cc", |
- "spdy/spdy_prefixed_buffer_reader.h", |
- "spdy/spdy_protocol.cc", |
- "spdy/spdy_protocol.h", |
- "spdy/spdy_proxy_client_socket.cc", |
- "spdy/spdy_proxy_client_socket.h", |
- "spdy/spdy_read_queue.cc", |
- "spdy/spdy_read_queue.h", |
- "spdy/spdy_session.cc", |
- "spdy/spdy_session.h", |
- "spdy/spdy_session_key.cc", |
- "spdy/spdy_session_key.h", |
- "spdy/spdy_session_pool.cc", |
- "spdy/spdy_session_pool.h", |
- "spdy/spdy_stream.cc", |
- "spdy/spdy_stream.h", |
- "spdy/spdy_write_queue.cc", |
- "spdy/spdy_write_queue.h", |
- "spdy/write_scheduler.h", |
- "spdy/zero_copy_output_buffer.h", |
"ssl/client_cert_store.h", |
"ssl/client_cert_store_mac.cc", |
"ssl/client_cert_store_mac.h", |
@@ -2471,8 +2471,8 @@ static_library("test_support") { |
"proxy/proxy_config_service_common_unittest.h", |
"socket/socket_test_util.cc", |
"socket/socket_test_util.h", |
- "spdy/spdy_test_util_common.cc", |
- "spdy/spdy_test_util_common.h", |
+ "spdy/chromium/spdy_test_util_common.cc", |
+ "spdy/chromium/spdy_test_util_common.h", |
"test/cert_test_util.cc", |
"test/cert_test_util.h", |
"test/cert_test_util_nss.cc", |
@@ -2792,7 +2792,7 @@ if (!is_ios && !is_android) { |
executable("hpack_example_generator") { |
testonly = true |
sources = [ |
- "spdy/fuzzing/hpack_example_generator.cc", |
+ "spdy/core/fuzzing/hpack_example_generator.cc", |
] |
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
@@ -4737,63 +4737,63 @@ test("net_unittests") { |
"socket/unix_domain_server_socket_posix_unittest.cc", |
"socket/websocket_endpoint_lock_manager_unittest.cc", |
"socket/websocket_transport_client_socket_pool_unittest.cc", |
- "spdy/array_output_buffer.cc", |
- "spdy/array_output_buffer.h", |
- "spdy/array_output_buffer_test.cc", |
- "spdy/bidirectional_stream_spdy_impl_unittest.cc", |
- "spdy/buffered_spdy_framer_unittest.cc", |
- "spdy/fuzzing/hpack_fuzz_util_test.cc", |
- "spdy/header_coalescer_test.cc", |
- "spdy/hpack/hpack_decoder3_test.cc", |
- "spdy/hpack/hpack_decoder_test.cc", |
- "spdy/hpack/hpack_encoder_test.cc", |
- "spdy/hpack/hpack_entry_test.cc", |
- "spdy/hpack/hpack_header_table_test.cc", |
- "spdy/hpack/hpack_huffman_decoder_test.cc", |
- "spdy/hpack/hpack_huffman_table_test.cc", |
- "spdy/hpack/hpack_input_stream_test.cc", |
- "spdy/hpack/hpack_output_stream_test.cc", |
- "spdy/hpack/hpack_round_trip_test.cc", |
- "spdy/hpack/hpack_static_table_test.cc", |
- "spdy/http2_priority_dependencies_unittest.cc", |
- "spdy/lifo_write_scheduler_test.cc", |
- "spdy/mock_spdy_framer_visitor.cc", |
- "spdy/mock_spdy_framer_visitor.h", |
+ "spdy/chromium/bidirectional_stream_spdy_impl_unittest.cc", |
+ "spdy/chromium/buffered_spdy_framer_unittest.cc", |
+ "spdy/chromium/header_coalescer_test.cc", |
+ "spdy/chromium/http2_priority_dependencies_unittest.cc", |
+ "spdy/chromium/spdy_buffer_unittest.cc", |
+ "spdy/chromium/spdy_http_stream_unittest.cc", |
+ "spdy/chromium/spdy_http_utils_unittest.cc", |
+ "spdy/chromium/spdy_log_util_unittest.cc", |
+ "spdy/chromium/spdy_network_transaction_unittest.cc", |
+ "spdy/chromium/spdy_proxy_client_socket_unittest.cc", |
+ "spdy/chromium/spdy_read_queue_unittest.cc", |
+ "spdy/chromium/spdy_session_pool_unittest.cc", |
+ "spdy/chromium/spdy_session_test_util.cc", |
+ "spdy/chromium/spdy_session_test_util.h", |
+ "spdy/chromium/spdy_session_unittest.cc", |
+ "spdy/chromium/spdy_stream_test_util.cc", |
+ "spdy/chromium/spdy_stream_test_util.h", |
+ "spdy/chromium/spdy_stream_unittest.cc", |
+ "spdy/chromium/spdy_write_queue_unittest.cc", |
+ "spdy/core/array_output_buffer.cc", |
+ "spdy/core/array_output_buffer.h", |
+ "spdy/core/array_output_buffer_test.cc", |
+ "spdy/core/fuzzing/hpack_fuzz_util_test.cc", |
+ "spdy/core/hpack/hpack_decoder3_test.cc", |
+ "spdy/core/hpack/hpack_decoder_test.cc", |
+ "spdy/core/hpack/hpack_encoder_test.cc", |
+ "spdy/core/hpack/hpack_entry_test.cc", |
+ "spdy/core/hpack/hpack_header_table_test.cc", |
+ "spdy/core/hpack/hpack_huffman_decoder_test.cc", |
+ "spdy/core/hpack/hpack_huffman_table_test.cc", |
+ "spdy/core/hpack/hpack_input_stream_test.cc", |
+ "spdy/core/hpack/hpack_output_stream_test.cc", |
+ "spdy/core/hpack/hpack_round_trip_test.cc", |
+ "spdy/core/hpack/hpack_static_table_test.cc", |
+ "spdy/core/lifo_write_scheduler_test.cc", |
+ "spdy/core/mock_spdy_framer_visitor.cc", |
+ "spdy/core/mock_spdy_framer_visitor.h", |
+ "spdy/core/priority_write_scheduler_test.cc", |
+ "spdy/core/spdy_alt_svc_wire_format_test.cc", |
+ "spdy/core/spdy_deframer_visitor.cc", |
+ "spdy/core/spdy_deframer_visitor.h", |
+ "spdy/core/spdy_deframer_visitor_test.cc", |
+ "spdy/core/spdy_frame_builder_test.cc", |
+ "spdy/core/spdy_frame_reader_test.cc", |
+ "spdy/core/spdy_framer_test.cc", |
+ "spdy/core/spdy_header_block_test.cc", |
+ "spdy/core/spdy_header_indexing_test.cc", |
+ "spdy/core/spdy_no_op_visitor.cc", |
+ "spdy/core/spdy_no_op_visitor.h", |
+ "spdy/core/spdy_pinnable_buffer_piece_test.cc", |
+ "spdy/core/spdy_prefixed_buffer_reader_test.cc", |
+ "spdy/core/spdy_protocol_test.cc", |
+ "spdy/core/spdy_protocol_test_utils.cc", |
+ "spdy/core/spdy_protocol_test_utils.h", |
+ "spdy/core/spdy_test_utils.cc", |
+ "spdy/core/spdy_test_utils.h", |
"spdy/platform/api/spdy_string_utils_test.cc", |
- "spdy/priority_write_scheduler_test.cc", |
- "spdy/spdy_alt_svc_wire_format_test.cc", |
- "spdy/spdy_buffer_unittest.cc", |
- "spdy/spdy_deframer_visitor.cc", |
- "spdy/spdy_deframer_visitor.h", |
- "spdy/spdy_deframer_visitor_test.cc", |
- "spdy/spdy_frame_builder_test.cc", |
- "spdy/spdy_frame_reader_test.cc", |
- "spdy/spdy_framer_test.cc", |
- "spdy/spdy_header_block_test.cc", |
- "spdy/spdy_header_indexing_test.cc", |
- "spdy/spdy_http_stream_unittest.cc", |
- "spdy/spdy_http_utils_unittest.cc", |
- "spdy/spdy_log_util_unittest.cc", |
- "spdy/spdy_network_transaction_unittest.cc", |
- "spdy/spdy_no_op_visitor.cc", |
- "spdy/spdy_no_op_visitor.h", |
- "spdy/spdy_pinnable_buffer_piece_test.cc", |
- "spdy/spdy_prefixed_buffer_reader_test.cc", |
- "spdy/spdy_protocol_test.cc", |
- "spdy/spdy_protocol_test_utils.cc", |
- "spdy/spdy_protocol_test_utils.h", |
- "spdy/spdy_proxy_client_socket_unittest.cc", |
- "spdy/spdy_read_queue_unittest.cc", |
- "spdy/spdy_session_pool_unittest.cc", |
- "spdy/spdy_session_test_util.cc", |
- "spdy/spdy_session_test_util.h", |
- "spdy/spdy_session_unittest.cc", |
- "spdy/spdy_stream_test_util.cc", |
- "spdy/spdy_stream_test_util.h", |
- "spdy/spdy_stream_unittest.cc", |
- "spdy/spdy_test_utils.cc", |
- "spdy/spdy_test_utils.h", |
- "spdy/spdy_write_queue_unittest.cc", |
"ssl/channel_id_service_unittest.cc", |
"ssl/client_cert_store_mac_unittest.cc", |
"ssl/client_cert_store_nss_unittest.cc", |
@@ -5132,7 +5132,7 @@ test("net_unittests") { |
# Need to read input data files. |
"socket/ssl_server_socket_unittest.cc", |
- "spdy/fuzzing/hpack_fuzz_util_test.cc", |
+ "spdy/core/fuzzing/hpack_fuzz_util_test.cc", |
# Need TestServer. |
"cert_net/cert_net_fetcher_impl_unittest.cc", |
@@ -5179,8 +5179,8 @@ test("net_unittests") { |
"http/http_network_transaction_unittest.cc", |
"http/http_proxy_client_socket_pool_unittest.cc", |
"socket/ssl_client_socket_pool_unittest.cc", |
- "spdy/spdy_network_transaction_unittest.cc", |
- "spdy/spdy_proxy_client_socket_unittest.cc", |
+ "spdy/chromium/spdy_network_transaction_unittest.cc", |
+ "spdy/chromium/spdy_proxy_client_socket_unittest.cc", |
"url_request/url_request_job_unittest.cc", |
"url_request/url_request_unittest.cc", |
] |
@@ -5801,7 +5801,7 @@ fuzzer_test("net_http_server_fuzzer") { |
fuzzer_test("net_spdy_session_fuzzer") { |
sources = [ |
- "spdy/spdy_session_fuzzer.cc", |
+ "spdy/chromium/spdy_session_fuzzer.cc", |
] |
deps = [ |
":net_fuzzer_test_support", |