Moves //third_party/http2:http2_structures_lib to //third_party/http2…

…/core/.

This CL moves the last target from //third_party/http2/ to http2/core/.

Protected by refactoring, no functional change; not protected.

PiperOrigin-RevId: 703195431

build/source_list.bzl

@@ -81,6 +81,7 @@ quiche_core_hdrs = [
     "http2/core/http2_constants.h",
     "http2/core/http2_frame_decoder_adapter.h",
     "http2/core/http2_header_block_hpack_listener.h",
+    "http2/core/http2_structures.h",
     "http2/core/http2_trace_logging.h",
     "http2/core/no_op_headers_handler.h",
     "http2/core/priority_write_scheduler.h",
@@ -140,7 +141,6 @@ quiche_core_hdrs = [
     "http2/hpack/huffman/huffman_spec_tables.h",
     "http2/hpack/varint/hpack_varint_decoder.h",
     "http2/hpack/varint/hpack_varint_encoder.h",
-    "http2/http2_structures.h",
     "quic/core/chlo_extractor.h",
     "quic/core/congestion_control/bandwidth_sampler.h",
     "quic/core/congestion_control/bbr2_drain.h",
@@ -438,6 +438,7 @@ quiche_core_srcs = [
     "http2/core/array_output_buffer.cc",
     "http2/core/http2_constants.cc",
     "http2/core/http2_frame_decoder_adapter.cc",
+    "http2/core/http2_structures.cc",
     "http2/core/http2_trace_logging.cc",
     "http2/core/recording_headers_handler.cc",
     "http2/core/spdy_alt_svc_wire_format.cc",
@@ -492,7 +493,6 @@ quiche_core_srcs = [
     "http2/hpack/huffman/huffman_spec_tables.cc",
     "http2/hpack/varint/hpack_varint_decoder.cc",
     "http2/hpack/varint/hpack_varint_encoder.cc",
-    "http2/http2_structures.cc",
     "quic/core/chlo_extractor.cc",
     "quic/core/congestion_control/bandwidth_sampler.cc",
     "quic/core/congestion_control/bbr2_drain.cc",
@@ -1122,6 +1122,7 @@ quiche_tests_srcs = [
     "http2/adapter/window_manager_test.cc",
     "http2/core/array_output_buffer_test.cc",
     "http2/core/http2_constants_test.cc",
+    "http2/core/http2_structures_test.cc",
     "http2/core/priority_write_scheduler_test.cc",
     "http2/core/spdy_alt_svc_wire_format_test.cc",
     "http2/core/spdy_frame_builder_test.cc",
@@ -1170,7 +1171,6 @@ quiche_tests_srcs = [
     "http2/hpack/varint/hpack_varint_decoder_test.cc",
     "http2/hpack/varint/hpack_varint_encoder_test.cc",
     "http2/hpack/varint/hpack_varint_round_trip_test.cc",
-    "http2/http2_structures_test.cc",
     "http2/test_tools/hpack_block_builder_test.cc",
     "http2/test_tools/hpack_example_test.cc",
     "http2/test_tools/http2_frame_builder_test.cc",

build/source_list.gni

@@ -81,6 +81,7 @@ quiche_core_hdrs = [
     "src/quiche/http2/core/http2_constants.h",
     "src/quiche/http2/core/http2_frame_decoder_adapter.h",
     "src/quiche/http2/core/http2_header_block_hpack_listener.h",
+    "src/quiche/http2/core/http2_structures.h",
     "src/quiche/http2/core/http2_trace_logging.h",
     "src/quiche/http2/core/no_op_headers_handler.h",
     "src/quiche/http2/core/priority_write_scheduler.h",
@@ -140,7 +141,6 @@ quiche_core_hdrs = [
     "src/quiche/http2/hpack/huffman/huffman_spec_tables.h",
     "src/quiche/http2/hpack/varint/hpack_varint_decoder.h",
     "src/quiche/http2/hpack/varint/hpack_varint_encoder.h",
-    "src/quiche/http2/http2_structures.h",
     "src/quiche/quic/core/chlo_extractor.h",
     "src/quiche/quic/core/congestion_control/bandwidth_sampler.h",
     "src/quiche/quic/core/congestion_control/bbr2_drain.h",
@@ -438,6 +438,7 @@ quiche_core_srcs = [
     "src/quiche/http2/core/array_output_buffer.cc",
     "src/quiche/http2/core/http2_constants.cc",
     "src/quiche/http2/core/http2_frame_decoder_adapter.cc",
+    "src/quiche/http2/core/http2_structures.cc",
     "src/quiche/http2/core/http2_trace_logging.cc",
     "src/quiche/http2/core/recording_headers_handler.cc",
     "src/quiche/http2/core/spdy_alt_svc_wire_format.cc",
@@ -492,7 +493,6 @@ quiche_core_srcs = [
     "src/quiche/http2/hpack/huffman/huffman_spec_tables.cc",
     "src/quiche/http2/hpack/varint/hpack_varint_decoder.cc",
     "src/quiche/http2/hpack/varint/hpack_varint_encoder.cc",
-    "src/quiche/http2/http2_structures.cc",
     "src/quiche/quic/core/chlo_extractor.cc",
     "src/quiche/quic/core/congestion_control/bandwidth_sampler.cc",
     "src/quiche/quic/core/congestion_control/bbr2_drain.cc",
@@ -1123,6 +1123,7 @@ quiche_tests_srcs = [
     "src/quiche/http2/adapter/window_manager_test.cc",
     "src/quiche/http2/core/array_output_buffer_test.cc",
     "src/quiche/http2/core/http2_constants_test.cc",
+    "src/quiche/http2/core/http2_structures_test.cc",
     "src/quiche/http2/core/priority_write_scheduler_test.cc",
     "src/quiche/http2/core/spdy_alt_svc_wire_format_test.cc",
     "src/quiche/http2/core/spdy_frame_builder_test.cc",
@@ -1171,7 +1172,6 @@ quiche_tests_srcs = [
     "src/quiche/http2/hpack/varint/hpack_varint_decoder_test.cc",
     "src/quiche/http2/hpack/varint/hpack_varint_encoder_test.cc",
     "src/quiche/http2/hpack/varint/hpack_varint_round_trip_test.cc",
-    "src/quiche/http2/http2_structures_test.cc",
     "src/quiche/http2/test_tools/hpack_block_builder_test.cc",
     "src/quiche/http2/test_tools/hpack_example_test.cc",
     "src/quiche/http2/test_tools/http2_frame_builder_test.cc",

build/source_list.json

@@ -80,6 +80,7 @@
     "quiche/http2/core/http2_constants.h",
     "quiche/http2/core/http2_frame_decoder_adapter.h",
     "quiche/http2/core/http2_header_block_hpack_listener.h",
+    "quiche/http2/core/http2_structures.h",
     "quiche/http2/core/http2_trace_logging.h",
     "quiche/http2/core/no_op_headers_handler.h",
     "quiche/http2/core/priority_write_scheduler.h",
@@ -139,7 +140,6 @@
     "quiche/http2/hpack/huffman/huffman_spec_tables.h",
     "quiche/http2/hpack/varint/hpack_varint_decoder.h",
     "quiche/http2/hpack/varint/hpack_varint_encoder.h",
-    "quiche/http2/http2_structures.h",
     "quiche/quic/core/chlo_extractor.h",
     "quiche/quic/core/congestion_control/bandwidth_sampler.h",
     "quiche/quic/core/congestion_control/bbr2_drain.h",
@@ -437,6 +437,7 @@
     "quiche/http2/core/array_output_buffer.cc",
     "quiche/http2/core/http2_constants.cc",
     "quiche/http2/core/http2_frame_decoder_adapter.cc",
+    "quiche/http2/core/http2_structures.cc",
     "quiche/http2/core/http2_trace_logging.cc",
     "quiche/http2/core/recording_headers_handler.cc",
     "quiche/http2/core/spdy_alt_svc_wire_format.cc",
@@ -491,7 +492,6 @@
     "quiche/http2/hpack/huffman/huffman_spec_tables.cc",
     "quiche/http2/hpack/varint/hpack_varint_decoder.cc",
     "quiche/http2/hpack/varint/hpack_varint_encoder.cc",
-    "quiche/http2/http2_structures.cc",
     "quiche/quic/core/chlo_extractor.cc",
     "quiche/quic/core/congestion_control/bandwidth_sampler.cc",
     "quiche/quic/core/congestion_control/bbr2_drain.cc",
@@ -1122,6 +1122,7 @@
     "quiche/http2/adapter/window_manager_test.cc",
     "quiche/http2/core/array_output_buffer_test.cc",
     "quiche/http2/core/http2_constants_test.cc",
+    "quiche/http2/core/http2_structures_test.cc",
     "quiche/http2/core/priority_write_scheduler_test.cc",
     "quiche/http2/core/spdy_alt_svc_wire_format_test.cc",
     "quiche/http2/core/spdy_frame_builder_test.cc",
@@ -1170,7 +1171,6 @@
     "quiche/http2/hpack/varint/hpack_varint_decoder_test.cc",
     "quiche/http2/hpack/varint/hpack_varint_encoder_test.cc",
     "quiche/http2/hpack/varint/hpack_varint_round_trip_test.cc",
-    "quiche/http2/http2_structures_test.cc",
     "quiche/http2/test_tools/hpack_block_builder_test.cc",
     "quiche/http2/test_tools/hpack_example_test.cc",
     "quiche/http2/test_tools/http2_frame_builder_test.cc",

quiche/http2/core/http2_frame_decoder_adapter.cc

@@ -18,6 +18,7 @@
 
 #include "absl/strings/string_view.h"
 #include "quiche/http2/core/http2_constants.h"
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/http2/core/spdy_alt_svc_wire_format.h"
 #include "quiche/http2/core/spdy_headers_handler_interface.h"
 #include "quiche/http2/core/spdy_protocol.h"
@@ -27,7 +28,6 @@
 #include "quiche/http2/hpack/decoder/hpack_decoding_error.h"
 #include "quiche/http2/hpack/hpack_decoder_adapter.h"
 #include "quiche/http2/hpack/hpack_header_table.h"
-#include "quiche/http2/http2_structures.h"
 #include "quiche/common/platform/api/quiche_bug_tracker.h"
 #include "quiche/common/platform/api/quiche_logging.h"
 #include "quiche/common/quiche_endian.h"

quiche/http2/core/http2_frame_decoder_adapter.h

@@ -14,14 +14,14 @@
 
 #include "absl/strings/string_view.h"
 #include "quiche/http2/core/http2_constants.h"
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/http2/core/spdy_alt_svc_wire_format.h"
 #include "quiche/http2/core/spdy_headers_handler_interface.h"
 #include "quiche/http2/core/spdy_protocol.h"
 #include "quiche/http2/decoder/decode_status.h"
 #include "quiche/http2/decoder/http2_frame_decoder.h"
 #include "quiche/http2/decoder/http2_frame_decoder_listener.h"
 #include "quiche/http2/hpack/hpack_decoder_adapter.h"
-#include "quiche/http2/http2_structures.h"
 #include "quiche/common/platform/api/quiche_export.h"
 
 namespace spdy {

quiche/http2/http2_structures.cc → quiche/http2/core/http2_structures.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "quiche/http2/http2_structures.h"
+#include "quiche/http2/core/http2_structures.h"
 
 #include <cstring>  // For std::memcmp
 #include <ostream>

quiche/http2/http2_structures.h → quiche/http2/core/http2_structures.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef QUICHE_HTTP2_HTTP2_STRUCTURES_H_
-#define QUICHE_HTTP2_HTTP2_STRUCTURES_H_
+#ifndef QUICHE_HTTP2_CORE_HTTP2_STRUCTURES_H_
+#define QUICHE_HTTP2_CORE_HTTP2_STRUCTURES_H_
 
 // Defines structs for various fixed sized structures in HTTP/2.
 //
@@ -344,4 +344,4 @@ QUICHE_EXPORT std::ostream& operator<<(std::ostream& out,
 
 }  // namespace http2
 
-#endif  // QUICHE_HTTP2_HTTP2_STRUCTURES_H_
+#endif  // QUICHE_HTTP2_CORE_HTTP2_STRUCTURES_H_

quiche/http2/http2_structures_test.cc → quiche/http2/core/http2_structures_test.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "quiche/http2/http2_structures.h"
+#include "quiche/http2/core/http2_structures.h"
 
 // Tests are focused on Http2FrameHeader because it has by far the most
 // methods of any of the structures.

quiche/http2/decoder/decode_http2_structures.h

@@ -7,8 +7,8 @@
 
 // Provides functions for decoding the fixed size structures in the HTTP/2 spec.
 
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/http2/decoder/decode_buffer.h"
-#include "quiche/http2/http2_structures.h"
 #include "quiche/common/platform/api/quiche_export.h"
 
 namespace http2 {

quiche/http2/decoder/decode_http2_structures_test.cc

@@ -5,7 +5,7 @@
 #include "quiche/http2/decoder/decode_http2_structures.h"
 
 // Tests decoding all of the fixed size HTTP/2 structures (i.e. those defined
-// in quiche/http2/http2_structures.h).
+// in quiche/http2/core/http2_structures.h).
 
 #include <stddef.h>
 

quiche/http2/decoder/frame_decoder_state.h

@@ -17,11 +17,11 @@
 #include <cstdint>
 
 #include "quiche/http2/core/http2_constants.h"
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/http2/decoder/decode_buffer.h"
 #include "quiche/http2/decoder/decode_status.h"
 #include "quiche/http2/decoder/http2_frame_decoder_listener.h"
 #include "quiche/http2/decoder/http2_structure_decoder.h"
-#include "quiche/http2/http2_structures.h"
 #include "quiche/common/platform/api/quiche_export.h"
 #include "quiche/common/platform/api/quiche_logging.h"
 

quiche/http2/decoder/http2_frame_decoder.h

@@ -21,6 +21,7 @@
 
 #include <cstdint>
 
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/http2/decoder/decode_buffer.h"
 #include "quiche/http2/decoder/decode_status.h"
 #include "quiche/http2/decoder/frame_decoder_state.h"
@@ -38,7 +39,6 @@
 #include "quiche/http2/decoder/payload_decoders/settings_payload_decoder.h"
 #include "quiche/http2/decoder/payload_decoders/unknown_payload_decoder.h"
 #include "quiche/http2/decoder/payload_decoders/window_update_payload_decoder.h"
-#include "quiche/http2/http2_structures.h"
 #include "quiche/common/platform/api/quiche_export.h"
 #include "quiche/common/platform/api/quiche_logging.h"
 

quiche/http2/decoder/http2_frame_decoder_listener.h

@@ -32,7 +32,7 @@
 #include <type_traits>
 
 #include "quiche/http2/core/http2_constants.h"
-#include "quiche/http2/http2_structures.h"
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/common/platform/api/quiche_export.h"
 
 namespace http2 {

quiche/http2/decoder/http2_structure_decoder.h

@@ -6,19 +6,19 @@
 #define QUICHE_HTTP2_DECODER_HTTP2_STRUCTURE_DECODER_H_
 
 // Http2StructureDecoder is a class for decoding the fixed size structures in
-// the HTTP/2 spec, defined in quiche/http2/http2_structures.h. This class
-// is in aid of deciding whether to keep the SlowDecode methods which I
+// the HTTP/2 spec, defined in quiche/http2/core/http2_structures.h. This
+// class is in aid of deciding whether to keep the SlowDecode methods which I
 // (jamessynge) now think may not be worth their complexity. In particular,
 // if most transport buffers are large, so it is rare that a structure is
 // split across buffer boundaries, than the cost of buffering upon
 // those rare occurrences is small, which then simplifies the callers.
 
 #include <cstdint>
 
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/http2/decoder/decode_buffer.h"
 #include "quiche/http2/decoder/decode_http2_structures.h"
 #include "quiche/http2/decoder/decode_status.h"
-#include "quiche/http2/http2_structures.h"
 #include "quiche/common/platform/api/quiche_export.h"
 #include "quiche/common/platform/api/quiche_logging.h"
 

quiche/http2/decoder/http2_structure_decoder_remaining_payload_test.cc

@@ -1,8 +1,8 @@
 // Tests decoding all of the fixed size HTTP/2 structures that are in the frame
-// payload (i.e. those defined in quiche/http2/http2_structures.h, except
-// Http2FrameHeader) using Http2StructureDecoder, which handles buffering of
-// structures split across input buffer boundaries, and in turn
-// uses DoDecode when it has all of a structure in a contiguous buffer.
+// payload (i.e. those defined in quiche/http2/core/http2_structures.h,
+// except Http2FrameHeader) using Http2StructureDecoder, which handles buffering
+// of structures split across input buffer boundaries, and in turn uses DoDecode
+// when it has all of a structure in a contiguous buffer.
 
 #include <stddef.h>
 
@@ -13,10 +13,10 @@
 #include "absl/flags/flag.h"
 #include "absl/strings/string_view.h"
 #include "quiche/http2/core/http2_constants.h"
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/http2/decoder/decode_buffer.h"
 #include "quiche/http2/decoder/decode_status.h"
 #include "quiche/http2/decoder/http2_structure_decoder.h"
-#include "quiche/http2/http2_structures.h"
 #include "quiche/http2/test_tools/http2_structure_decoder_test_util.h"
 #include "quiche/http2/test_tools/http2_structures_test_util.h"
 #include "quiche/http2/test_tools/random_decoder_test_base.h"

quiche/http2/decoder/http2_structure_decoder_test.cc

@@ -5,7 +5,7 @@
 #include "quiche/http2/decoder/http2_structure_decoder.h"
 
 // Tests decoding all of the fixed size HTTP/2 structures (i.e. those defined in
-// quiche/http2/http2_structures.h) using Http2StructureDecoder, which
+// quiche/http2/core/http2_structures.h) using Http2StructureDecoder, which
 // handles buffering of structures split across input buffer boundaries, and in
 // turn uses DoDecode when it has all of a structure in a contiguous buffer.
 

quiche/http2/decoder/payload_decoders/altsvc_payload_decoder.cc

@@ -10,9 +10,9 @@
 
 #include "absl/base/macros.h"
 #include "quiche/http2/core/http2_constants.h"
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/http2/decoder/decode_buffer.h"
 #include "quiche/http2/decoder/http2_frame_decoder_listener.h"
-#include "quiche/http2/http2_structures.h"
 #include "quiche/common/platform/api/quiche_bug_tracker.h"
 #include "quiche/common/platform/api/quiche_logging.h"
 

quiche/http2/decoder/payload_decoders/altsvc_payload_decoder.h

@@ -7,10 +7,10 @@
 
 // Decodes the payload of a ALTSVC frame.
 
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/http2/decoder/decode_buffer.h"
 #include "quiche/http2/decoder/decode_status.h"
 #include "quiche/http2/decoder/frame_decoder_state.h"
-#include "quiche/http2/http2_structures.h"
 #include "quiche/common/platform/api/quiche_export.h"
 
 namespace http2 {

quiche/http2/decoder/payload_decoders/continuation_payload_decoder.cc

@@ -7,9 +7,9 @@
 #include <stddef.h>
 
 #include "quiche/http2/core/http2_constants.h"
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/http2/decoder/decode_buffer.h"
 #include "quiche/http2/decoder/http2_frame_decoder_listener.h"
-#include "quiche/http2/http2_structures.h"
 #include "quiche/common/platform/api/quiche_logging.h"
 
 namespace http2 {

quiche/http2/decoder/payload_decoders/continuation_payload_decoder_test.cc

@@ -10,8 +10,8 @@
 #include <type_traits>
 
 #include "quiche/http2/core/http2_constants.h"
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/http2/decoder/http2_frame_decoder_listener.h"
-#include "quiche/http2/http2_structures.h"
 #include "quiche/http2/test_tools/frame_parts.h"
 #include "quiche/http2/test_tools/frame_parts_collector.h"
 #include "quiche/http2/test_tools/payload_decoder_base_test_util.h"

quiche/http2/decoder/payload_decoders/data_payload_decoder.cc

@@ -10,9 +10,9 @@
 
 #include "absl/base/macros.h"
 #include "quiche/http2/core/http2_constants.h"
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/http2/decoder/decode_buffer.h"
 #include "quiche/http2/decoder/http2_frame_decoder_listener.h"
-#include "quiche/http2/http2_structures.h"
 #include "quiche/common/platform/api/quiche_bug_tracker.h"
 #include "quiche/common/platform/api/quiche_logging.h"
 

quiche/http2/decoder/payload_decoders/data_payload_decoder_test.cc

@@ -9,8 +9,8 @@
 #include <string>
 
 #include "quiche/http2/core/http2_constants.h"
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/http2/decoder/http2_frame_decoder_listener.h"
-#include "quiche/http2/http2_structures.h"
 #include "quiche/http2/test_tools/frame_parts.h"
 #include "quiche/http2/test_tools/frame_parts_collector.h"
 #include "quiche/http2/test_tools/http2_frame_builder.h"