Rename spdy::Http2HeaderBlock into quiche::HttpHeaderBlock.
Http2HeaderBlock is used in HTTP/3 code too, thus this naming makes more sense.
PiperOrigin-RevId: 568272632
diff --git a/build/source_list.bzl b/build/source_list.bzl
index 4174621..bdb0b9e 100644
--- a/build/source_list.bzl
+++ b/build/source_list.bzl
@@ -11,6 +11,8 @@
quiche_core_hdrs = [
"common/btree_scheduler.h",
"common/capsule.h",
+ "common/http/http_header_block.h",
+ "common/http/http_header_storage.h",
"common/masque/connect_udp_datagram_payload.h",
"common/platform/api/quiche_bug_tracker.h",
"common/platform/api/quiche_client_stats.h",
@@ -47,6 +49,7 @@
"common/quiche_mem_slice_storage.h",
"common/quiche_protocol_flags_list.h",
"common/quiche_random.h",
+ "common/quiche_simple_arena.h",
"common/quiche_status_utils.h",
"common/quiche_stream.h",
"common/quiche_text_utils.h",
@@ -376,7 +379,6 @@
"spdy/core/http2_frame_decoder_adapter.h",
"spdy/core/http2_header_block.h",
"spdy/core/http2_header_block_hpack_listener.h",
- "spdy/core/http2_header_storage.h",
"spdy/core/metadata_extension.h",
"spdy/core/no_op_headers_handler.h",
"spdy/core/recording_headers_handler.h",
@@ -390,13 +392,14 @@
"spdy/core/spdy_pinnable_buffer_piece.h",
"spdy/core/spdy_prefixed_buffer_reader.h",
"spdy/core/spdy_protocol.h",
- "spdy/core/spdy_simple_arena.h",
"spdy/core/zero_copy_output_buffer.h",
"web_transport/complete_buffer_visitor.h",
"web_transport/web_transport.h",
]
quiche_core_srcs = [
"common/capsule.cc",
+ "common/http/http_header_block.cc",
+ "common/http/http_header_storage.cc",
"common/masque/connect_udp_datagram_payload.cc",
"common/platform/api/quiche_hostname_utils.cc",
"common/platform/api/quiche_mutex.cc",
@@ -408,6 +411,7 @@
"common/quiche_ip_address_family.cc",
"common/quiche_mem_slice_storage.cc",
"common/quiche_random.cc",
+ "common/quiche_simple_arena.cc",
"common/quiche_text_utils.cc",
"common/simple_buffer_allocator.cc",
"common/structured_headers.cc",
@@ -671,8 +675,6 @@
"spdy/core/hpack/hpack_output_stream.cc",
"spdy/core/hpack/hpack_static_table.cc",
"spdy/core/http2_frame_decoder_adapter.cc",
- "spdy/core/http2_header_block.cc",
- "spdy/core/http2_header_storage.cc",
"spdy/core/metadata_extension.cc",
"spdy/core/recording_headers_handler.cc",
"spdy/core/spdy_alt_svc_wire_format.cc",
@@ -682,7 +684,6 @@
"spdy/core/spdy_pinnable_buffer_piece.cc",
"spdy/core/spdy_prefixed_buffer_reader.cc",
"spdy/core/spdy_protocol.cc",
- "spdy/core/spdy_simple_arena.cc",
"web_transport/complete_buffer_visitor.cc",
]
quiche_tool_support_hdrs = [
@@ -1050,6 +1051,8 @@
"binary_http/binary_http_message_test.cc",
"common/btree_scheduler_test.cc",
"common/capsule_test.cc",
+ "common/http/http_header_block_test.cc",
+ "common/http/http_header_storage_test.cc",
"common/masque/connect_udp_datagram_payload_test.cc",
"common/platform/api/quiche_file_utils_test.cc",
"common/platform/api/quiche_hostname_utils_test.cc",
@@ -1070,6 +1073,7 @@
"common/quiche_linked_hash_map_test.cc",
"common/quiche_mem_slice_storage_test.cc",
"common/quiche_random_test.cc",
+ "common/quiche_simple_arena_test.cc",
"common/quiche_text_utils_test.cc",
"common/simple_buffer_allocator_test.cc",
"common/structured_headers_generated_test.cc",
@@ -1299,8 +1303,6 @@
"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/http2_header_block_test.cc",
- "spdy/core/http2_header_storage_test.cc",
"spdy/core/metadata_extension_test.cc",
"spdy/core/spdy_alt_svc_wire_format_test.cc",
"spdy/core/spdy_frame_builder_test.cc",
@@ -1309,7 +1311,6 @@
"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_simple_arena_test.cc",
]
io_tests_hdrs = [
]
diff --git a/build/source_list.gni b/build/source_list.gni
index 2681949..ce279c6 100644
--- a/build/source_list.gni
+++ b/build/source_list.gni
@@ -11,6 +11,8 @@
quiche_core_hdrs = [
"src/quiche/common/btree_scheduler.h",
"src/quiche/common/capsule.h",
+ "src/quiche/common/http/http_header_block.h",
+ "src/quiche/common/http/http_header_storage.h",
"src/quiche/common/masque/connect_udp_datagram_payload.h",
"src/quiche/common/platform/api/quiche_bug_tracker.h",
"src/quiche/common/platform/api/quiche_client_stats.h",
@@ -47,6 +49,7 @@
"src/quiche/common/quiche_mem_slice_storage.h",
"src/quiche/common/quiche_protocol_flags_list.h",
"src/quiche/common/quiche_random.h",
+ "src/quiche/common/quiche_simple_arena.h",
"src/quiche/common/quiche_status_utils.h",
"src/quiche/common/quiche_stream.h",
"src/quiche/common/quiche_text_utils.h",
@@ -376,7 +379,6 @@
"src/quiche/spdy/core/http2_frame_decoder_adapter.h",
"src/quiche/spdy/core/http2_header_block.h",
"src/quiche/spdy/core/http2_header_block_hpack_listener.h",
- "src/quiche/spdy/core/http2_header_storage.h",
"src/quiche/spdy/core/metadata_extension.h",
"src/quiche/spdy/core/no_op_headers_handler.h",
"src/quiche/spdy/core/recording_headers_handler.h",
@@ -390,13 +392,14 @@
"src/quiche/spdy/core/spdy_pinnable_buffer_piece.h",
"src/quiche/spdy/core/spdy_prefixed_buffer_reader.h",
"src/quiche/spdy/core/spdy_protocol.h",
- "src/quiche/spdy/core/spdy_simple_arena.h",
"src/quiche/spdy/core/zero_copy_output_buffer.h",
"src/quiche/web_transport/complete_buffer_visitor.h",
"src/quiche/web_transport/web_transport.h",
]
quiche_core_srcs = [
"src/quiche/common/capsule.cc",
+ "src/quiche/common/http/http_header_block.cc",
+ "src/quiche/common/http/http_header_storage.cc",
"src/quiche/common/masque/connect_udp_datagram_payload.cc",
"src/quiche/common/platform/api/quiche_hostname_utils.cc",
"src/quiche/common/platform/api/quiche_mutex.cc",
@@ -408,6 +411,7 @@
"src/quiche/common/quiche_ip_address_family.cc",
"src/quiche/common/quiche_mem_slice_storage.cc",
"src/quiche/common/quiche_random.cc",
+ "src/quiche/common/quiche_simple_arena.cc",
"src/quiche/common/quiche_text_utils.cc",
"src/quiche/common/simple_buffer_allocator.cc",
"src/quiche/common/structured_headers.cc",
@@ -671,8 +675,6 @@
"src/quiche/spdy/core/hpack/hpack_output_stream.cc",
"src/quiche/spdy/core/hpack/hpack_static_table.cc",
"src/quiche/spdy/core/http2_frame_decoder_adapter.cc",
- "src/quiche/spdy/core/http2_header_block.cc",
- "src/quiche/spdy/core/http2_header_storage.cc",
"src/quiche/spdy/core/metadata_extension.cc",
"src/quiche/spdy/core/recording_headers_handler.cc",
"src/quiche/spdy/core/spdy_alt_svc_wire_format.cc",
@@ -682,7 +684,6 @@
"src/quiche/spdy/core/spdy_pinnable_buffer_piece.cc",
"src/quiche/spdy/core/spdy_prefixed_buffer_reader.cc",
"src/quiche/spdy/core/spdy_protocol.cc",
- "src/quiche/spdy/core/spdy_simple_arena.cc",
"src/quiche/web_transport/complete_buffer_visitor.cc",
]
quiche_tool_support_hdrs = [
@@ -1051,6 +1052,8 @@
"src/quiche/binary_http/binary_http_message_test.cc",
"src/quiche/common/btree_scheduler_test.cc",
"src/quiche/common/capsule_test.cc",
+ "src/quiche/common/http/http_header_block_test.cc",
+ "src/quiche/common/http/http_header_storage_test.cc",
"src/quiche/common/masque/connect_udp_datagram_payload_test.cc",
"src/quiche/common/platform/api/quiche_file_utils_test.cc",
"src/quiche/common/platform/api/quiche_hostname_utils_test.cc",
@@ -1071,6 +1074,7 @@
"src/quiche/common/quiche_linked_hash_map_test.cc",
"src/quiche/common/quiche_mem_slice_storage_test.cc",
"src/quiche/common/quiche_random_test.cc",
+ "src/quiche/common/quiche_simple_arena_test.cc",
"src/quiche/common/quiche_text_utils_test.cc",
"src/quiche/common/simple_buffer_allocator_test.cc",
"src/quiche/common/structured_headers_generated_test.cc",
@@ -1300,8 +1304,6 @@
"src/quiche/spdy/core/hpack/hpack_output_stream_test.cc",
"src/quiche/spdy/core/hpack/hpack_round_trip_test.cc",
"src/quiche/spdy/core/hpack/hpack_static_table_test.cc",
- "src/quiche/spdy/core/http2_header_block_test.cc",
- "src/quiche/spdy/core/http2_header_storage_test.cc",
"src/quiche/spdy/core/metadata_extension_test.cc",
"src/quiche/spdy/core/spdy_alt_svc_wire_format_test.cc",
"src/quiche/spdy/core/spdy_frame_builder_test.cc",
@@ -1310,7 +1312,6 @@
"src/quiche/spdy/core/spdy_pinnable_buffer_piece_test.cc",
"src/quiche/spdy/core/spdy_prefixed_buffer_reader_test.cc",
"src/quiche/spdy/core/spdy_protocol_test.cc",
- "src/quiche/spdy/core/spdy_simple_arena_test.cc",
]
io_tests_hdrs = [
diff --git a/build/source_list.json b/build/source_list.json
index ad9e6d4..5dffaf9 100644
--- a/build/source_list.json
+++ b/build/source_list.json
@@ -10,6 +10,8 @@
"quiche_core_hdrs": [
"quiche/common/btree_scheduler.h",
"quiche/common/capsule.h",
+ "quiche/common/http/http_header_block.h",
+ "quiche/common/http/http_header_storage.h",
"quiche/common/masque/connect_udp_datagram_payload.h",
"quiche/common/platform/api/quiche_bug_tracker.h",
"quiche/common/platform/api/quiche_client_stats.h",
@@ -46,6 +48,7 @@
"quiche/common/quiche_mem_slice_storage.h",
"quiche/common/quiche_protocol_flags_list.h",
"quiche/common/quiche_random.h",
+ "quiche/common/quiche_simple_arena.h",
"quiche/common/quiche_status_utils.h",
"quiche/common/quiche_stream.h",
"quiche/common/quiche_text_utils.h",
@@ -375,7 +378,6 @@
"quiche/spdy/core/http2_frame_decoder_adapter.h",
"quiche/spdy/core/http2_header_block.h",
"quiche/spdy/core/http2_header_block_hpack_listener.h",
- "quiche/spdy/core/http2_header_storage.h",
"quiche/spdy/core/metadata_extension.h",
"quiche/spdy/core/no_op_headers_handler.h",
"quiche/spdy/core/recording_headers_handler.h",
@@ -389,13 +391,14 @@
"quiche/spdy/core/spdy_pinnable_buffer_piece.h",
"quiche/spdy/core/spdy_prefixed_buffer_reader.h",
"quiche/spdy/core/spdy_protocol.h",
- "quiche/spdy/core/spdy_simple_arena.h",
"quiche/spdy/core/zero_copy_output_buffer.h",
"quiche/web_transport/complete_buffer_visitor.h",
"quiche/web_transport/web_transport.h"
],
"quiche_core_srcs": [
"quiche/common/capsule.cc",
+ "quiche/common/http/http_header_block.cc",
+ "quiche/common/http/http_header_storage.cc",
"quiche/common/masque/connect_udp_datagram_payload.cc",
"quiche/common/platform/api/quiche_hostname_utils.cc",
"quiche/common/platform/api/quiche_mutex.cc",
@@ -407,6 +410,7 @@
"quiche/common/quiche_ip_address_family.cc",
"quiche/common/quiche_mem_slice_storage.cc",
"quiche/common/quiche_random.cc",
+ "quiche/common/quiche_simple_arena.cc",
"quiche/common/quiche_text_utils.cc",
"quiche/common/simple_buffer_allocator.cc",
"quiche/common/structured_headers.cc",
@@ -670,8 +674,6 @@
"quiche/spdy/core/hpack/hpack_output_stream.cc",
"quiche/spdy/core/hpack/hpack_static_table.cc",
"quiche/spdy/core/http2_frame_decoder_adapter.cc",
- "quiche/spdy/core/http2_header_block.cc",
- "quiche/spdy/core/http2_header_storage.cc",
"quiche/spdy/core/metadata_extension.cc",
"quiche/spdy/core/recording_headers_handler.cc",
"quiche/spdy/core/spdy_alt_svc_wire_format.cc",
@@ -681,7 +683,6 @@
"quiche/spdy/core/spdy_pinnable_buffer_piece.cc",
"quiche/spdy/core/spdy_prefixed_buffer_reader.cc",
"quiche/spdy/core/spdy_protocol.cc",
- "quiche/spdy/core/spdy_simple_arena.cc",
"quiche/web_transport/complete_buffer_visitor.cc"
],
"quiche_tool_support_hdrs": [
@@ -1050,6 +1051,8 @@
"quiche/binary_http/binary_http_message_test.cc",
"quiche/common/btree_scheduler_test.cc",
"quiche/common/capsule_test.cc",
+ "quiche/common/http/http_header_block_test.cc",
+ "quiche/common/http/http_header_storage_test.cc",
"quiche/common/masque/connect_udp_datagram_payload_test.cc",
"quiche/common/platform/api/quiche_file_utils_test.cc",
"quiche/common/platform/api/quiche_hostname_utils_test.cc",
@@ -1070,6 +1073,7 @@
"quiche/common/quiche_linked_hash_map_test.cc",
"quiche/common/quiche_mem_slice_storage_test.cc",
"quiche/common/quiche_random_test.cc",
+ "quiche/common/quiche_simple_arena_test.cc",
"quiche/common/quiche_text_utils_test.cc",
"quiche/common/simple_buffer_allocator_test.cc",
"quiche/common/structured_headers_generated_test.cc",
@@ -1299,8 +1303,6 @@
"quiche/spdy/core/hpack/hpack_output_stream_test.cc",
"quiche/spdy/core/hpack/hpack_round_trip_test.cc",
"quiche/spdy/core/hpack/hpack_static_table_test.cc",
- "quiche/spdy/core/http2_header_block_test.cc",
- "quiche/spdy/core/http2_header_storage_test.cc",
"quiche/spdy/core/metadata_extension_test.cc",
"quiche/spdy/core/spdy_alt_svc_wire_format_test.cc",
"quiche/spdy/core/spdy_frame_builder_test.cc",
@@ -1308,8 +1310,7 @@
"quiche/spdy/core/spdy_intrusive_list_test.cc",
"quiche/spdy/core/spdy_pinnable_buffer_piece_test.cc",
"quiche/spdy/core/spdy_prefixed_buffer_reader_test.cc",
- "quiche/spdy/core/spdy_protocol_test.cc",
- "quiche/spdy/core/spdy_simple_arena_test.cc"
+ "quiche/spdy/core/spdy_protocol_test.cc"
],
"io_tests_hdrs": [
