Moves //third_party/http2:http2_constants_lib to //third_party/http2/…

…core/.

There are only two targets in //third_party/http2. It seems cleaner to move them to http2/core/.

Protected by refactoring, no functional change; not protected.

PiperOrigin-RevId: 703154190

build/source_list.bzl

@@ -78,6 +78,7 @@ quiche_core_hdrs = [
     "http2/adapter/window_manager.h",
     "http2/core/array_output_buffer.h",
     "http2/core/header_byte_listener_interface.h",
+    "http2/core/http2_constants.h",
     "http2/core/http2_frame_decoder_adapter.h",
     "http2/core/http2_header_block_hpack_listener.h",
     "http2/core/http2_trace_logging.h",
@@ -139,7 +140,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_constants.h",
     "http2/http2_structures.h",
     "quic/core/chlo_extractor.h",
     "quic/core/congestion_control/bandwidth_sampler.h",
@@ -436,6 +436,7 @@ quiche_core_srcs = [
     "http2/adapter/oghttp2_util.cc",
     "http2/adapter/window_manager.cc",
     "http2/core/array_output_buffer.cc",
+    "http2/core/http2_constants.cc",
     "http2/core/http2_frame_decoder_adapter.cc",
     "http2/core/http2_trace_logging.cc",
     "http2/core/recording_headers_handler.cc",
@@ -491,7 +492,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_constants.cc",
     "http2/http2_structures.cc",
     "quic/core/chlo_extractor.cc",
     "quic/core/congestion_control/bandwidth_sampler.cc",
@@ -1121,6 +1121,7 @@ quiche_tests_srcs = [
     "http2/adapter/test_utils_test.cc",
     "http2/adapter/window_manager_test.cc",
     "http2/core/array_output_buffer_test.cc",
+    "http2/core/http2_constants_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",
@@ -1169,7 +1170,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_constants_test.cc",
     "http2/http2_structures_test.cc",
     "http2/test_tools/hpack_block_builder_test.cc",
     "http2/test_tools/hpack_example_test.cc",

build/source_list.gni

@@ -78,6 +78,7 @@ quiche_core_hdrs = [
     "src/quiche/http2/adapter/window_manager.h",
     "src/quiche/http2/core/array_output_buffer.h",
     "src/quiche/http2/core/header_byte_listener_interface.h",
+    "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_trace_logging.h",
@@ -139,7 +140,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_constants.h",
     "src/quiche/http2/http2_structures.h",
     "src/quiche/quic/core/chlo_extractor.h",
     "src/quiche/quic/core/congestion_control/bandwidth_sampler.h",
@@ -436,6 +436,7 @@ quiche_core_srcs = [
     "src/quiche/http2/adapter/oghttp2_util.cc",
     "src/quiche/http2/adapter/window_manager.cc",
     "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_trace_logging.cc",
     "src/quiche/http2/core/recording_headers_handler.cc",
@@ -491,7 +492,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_constants.cc",
     "src/quiche/http2/http2_structures.cc",
     "src/quiche/quic/core/chlo_extractor.cc",
     "src/quiche/quic/core/congestion_control/bandwidth_sampler.cc",
@@ -1122,6 +1122,7 @@ quiche_tests_srcs = [
     "src/quiche/http2/adapter/test_utils_test.cc",
     "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/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",
@@ -1170,7 +1171,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_constants_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",

build/source_list.json

@@ -77,6 +77,7 @@
     "quiche/http2/adapter/window_manager.h",
     "quiche/http2/core/array_output_buffer.h",
     "quiche/http2/core/header_byte_listener_interface.h",
+    "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_trace_logging.h",
@@ -138,7 +139,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_constants.h",
     "quiche/http2/http2_structures.h",
     "quiche/quic/core/chlo_extractor.h",
     "quiche/quic/core/congestion_control/bandwidth_sampler.h",
@@ -435,6 +435,7 @@
     "quiche/http2/adapter/oghttp2_util.cc",
     "quiche/http2/adapter/window_manager.cc",
     "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_trace_logging.cc",
     "quiche/http2/core/recording_headers_handler.cc",
@@ -490,7 +491,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_constants.cc",
     "quiche/http2/http2_structures.cc",
     "quiche/quic/core/chlo_extractor.cc",
     "quiche/quic/core/congestion_control/bandwidth_sampler.cc",
@@ -1121,6 +1121,7 @@
     "quiche/http2/adapter/test_utils_test.cc",
     "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/priority_write_scheduler_test.cc",
     "quiche/http2/core/spdy_alt_svc_wire_format_test.cc",
     "quiche/http2/core/spdy_frame_builder_test.cc",
@@ -1169,7 +1170,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_constants_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/adapter/header_validator.cc

@@ -9,7 +9,7 @@
 #include "absl/strings/numbers.h"
 #include "absl/strings/str_cat.h"
 #include "quiche/http2/adapter/header_validator_base.h"
-#include "quiche/http2/http2_constants.h"
+#include "quiche/http2/core/http2_constants.h"
 #include "quiche/common/platform/api/quiche_logging.h"
 
 namespace http2 {

quiche/http2/http2_constants.cc → quiche/http2/core/http2_constants.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_constants.h"
+#include "quiche/http2/core/http2_constants.h"
 
 #include <string>
 

quiche/http2/http2_constants.h → quiche/http2/core/http2_constants.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_CONSTANTS_H_
-#define QUICHE_HTTP2_HTTP2_CONSTANTS_H_
+#ifndef QUICHE_HTTP2_CORE_HTTP2_CONSTANTS_H_
+#define QUICHE_HTTP2_CORE_HTTP2_CONSTANTS_H_
 
 // Constants from the HTTP/2 spec, RFC 7540, and associated helper functions.
 
@@ -267,4 +267,4 @@ QUICHE_EXPORT const InvalidHeaderSet& GetInvalidHttp2HeaderSet();
 
 }  // namespace http2
 
-#endif  // QUICHE_HTTP2_HTTP2_CONSTANTS_H_
+#endif  // QUICHE_HTTP2_CORE_HTTP2_CONSTANTS_H_

quiche/http2/http2_constants_test.cc → quiche/http2/core/http2_constants_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_constants.h"
+#include "quiche/http2/core/http2_constants.h"
 
 #include "quiche/common/platform/api/quiche_test.h"
 

quiche/http2/core/http2_frame_decoder_adapter.cc

@@ -17,6 +17,7 @@
 #include <string>
 
 #include "absl/strings/string_view.h"
+#include "quiche/http2/core/http2_constants.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"
@@ -26,7 +27,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_constants.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/core/http2_frame_decoder_adapter.h

@@ -13,14 +13,14 @@
 #include <string>
 
 #include "absl/strings/string_view.h"
+#include "quiche/http2/core/http2_constants.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_constants.h"
 #include "quiche/http2/http2_structures.h"
 #include "quiche/common/platform/api/quiche_export.h"
 

quiche/http2/decoder/decode_http2_structures.cc

@@ -7,8 +7,8 @@
 #include <cstdint>
 #include <cstring>
 
+#include "quiche/http2/core/http2_constants.h"
 #include "quiche/http2/decoder/decode_buffer.h"
-#include "quiche/http2/http2_constants.h"
 #include "quiche/common/platform/api/quiche_logging.h"
 
 namespace http2 {

quiche/http2/decoder/decode_http2_structures_test.cc

@@ -12,9 +12,9 @@
 #include <string>
 
 #include "absl/strings/string_view.h"
+#include "quiche/http2/core/http2_constants.h"
 #include "quiche/http2/decoder/decode_buffer.h"
 #include "quiche/http2/decoder/decode_status.h"
-#include "quiche/http2/http2_constants.h"
 #include "quiche/http2/test_tools/http2_frame_builder.h"
 #include "quiche/http2/test_tools/http2_random.h"
 #include "quiche/http2/test_tools/http2_structures_test_util.h"

quiche/http2/decoder/frame_decoder_state.h

@@ -16,11 +16,11 @@
 
 #include <cstdint>
 
+#include "quiche/http2/core/http2_constants.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_constants.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.cc

@@ -6,9 +6,9 @@
 
 #include <ostream>
 
+#include "quiche/http2/core/http2_constants.h"
 #include "quiche/http2/decoder/decode_status.h"
 #include "quiche/http2/hpack/varint/hpack_varint_decoder.h"
-#include "quiche/http2/http2_constants.h"
 #include "quiche/common/platform/api/quiche_bug_tracker.h"
 #include "quiche/common/platform/api/quiche_logging.h"
 

quiche/http2/decoder/http2_frame_decoder_listener.h

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

quiche/http2/decoder/http2_frame_decoder_test.cc

@@ -11,7 +11,7 @@
 #include <vector>
 
 #include "absl/strings/string_view.h"
-#include "quiche/http2/http2_constants.h"
+#include "quiche/http2/core/http2_constants.h"
 #include "quiche/http2/test_tools/frame_parts.h"
 #include "quiche/http2/test_tools/frame_parts_collector_listener.h"
 #include "quiche/http2/test_tools/http2_random.h"

quiche/http2/decoder/http2_structure_decoder_remaining_payload_test.cc

@@ -12,10 +12,10 @@
 
 #include "absl/flags/flag.h"
 #include "absl/strings/string_view.h"
+#include "quiche/http2/core/http2_constants.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_constants.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"

quiche/http2/decoder/http2_structure_decoder_test.cc

@@ -25,9 +25,9 @@
 #include <utility>
 
 #include "absl/strings/string_view.h"
+#include "quiche/http2/core/http2_constants.h"
 #include "quiche/http2/decoder/decode_buffer.h"
 #include "quiche/http2/decoder/decode_status.h"
-#include "quiche/http2/http2_constants.h"
 #include "quiche/http2/test_tools/http2_frame_builder.h"
 #include "quiche/http2/test_tools/http2_structures_test_util.h"
 #include "quiche/http2/test_tools/random_decoder_test_base.h"

quiche/http2/decoder/payload_decoders/altsvc_payload_decoder.cc

@@ -9,9 +9,9 @@
 #include <ostream>
 
 #include "absl/base/macros.h"
+#include "quiche/http2/core/http2_constants.h"
 #include "quiche/http2/decoder/decode_buffer.h"
 #include "quiche/http2/decoder/http2_frame_decoder_listener.h"
-#include "quiche/http2/http2_constants.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_test.cc

@@ -9,8 +9,8 @@
 #include <string>
 #include <tuple>
 
+#include "quiche/http2/core/http2_constants.h"
 #include "quiche/http2/decoder/http2_frame_decoder_listener.h"
-#include "quiche/http2/http2_constants.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"

quiche/http2/decoder/payload_decoders/continuation_payload_decoder.cc

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

quiche/http2/decoder/payload_decoders/continuation_payload_decoder_test.cc

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

quiche/http2/decoder/payload_decoders/data_payload_decoder.cc

@@ -9,9 +9,9 @@
 #include <ostream>
 
 #include "absl/base/macros.h"
+#include "quiche/http2/core/http2_constants.h"
 #include "quiche/http2/decoder/decode_buffer.h"
 #include "quiche/http2/decoder/http2_frame_decoder_listener.h"
-#include "quiche/http2/http2_constants.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

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

quiche/http2/decoder/payload_decoders/goaway_payload_decoder.cc

@@ -9,9 +9,9 @@
 #include <ostream>
 
 #include "absl/base/macros.h"
+#include "quiche/http2/core/http2_constants.h"
 #include "quiche/http2/decoder/decode_buffer.h"
 #include "quiche/http2/decoder/http2_frame_decoder_listener.h"
-#include "quiche/http2/http2_constants.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/goaway_payload_decoder_test.cc

@@ -8,8 +8,8 @@
 
 #include <string>
 
+#include "quiche/http2/core/http2_constants.h"
 #include "quiche/http2/decoder/http2_frame_decoder_listener.h"
-#include "quiche/http2/http2_constants.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"