Migrates code from //third_party/spdy/core:spdy_framer_lib to //third_party/http2/core:spdy_framer. Protected by refactoring, no functional change; not protected. PiperOrigin-RevId: 678936445
diff --git a/build/source_list.bzl b/build/source_list.bzl index 8dece58..3e6c483 100644 --- a/build/source_list.bzl +++ b/build/source_list.bzl
@@ -399,8 +399,6 @@ "spdy/core/hpack/hpack_decoder_adapter.h", "spdy/core/hpack/hpack_encoder.h", "spdy/core/spdy_bitmasks.h", - "spdy/core/spdy_frame_builder.h", - "spdy/core/spdy_framer.h", "spdy/core/spdy_protocol.h", "web_transport/complete_buffer_visitor.h", "web_transport/encapsulated/encapsulated_web_transport.h",
diff --git a/build/source_list.gni b/build/source_list.gni index e871ba2..b42988e 100644 --- a/build/source_list.gni +++ b/build/source_list.gni
@@ -399,8 +399,6 @@ "src/quiche/spdy/core/hpack/hpack_decoder_adapter.h", "src/quiche/spdy/core/hpack/hpack_encoder.h", "src/quiche/spdy/core/spdy_bitmasks.h", - "src/quiche/spdy/core/spdy_frame_builder.h", - "src/quiche/spdy/core/spdy_framer.h", "src/quiche/spdy/core/spdy_protocol.h", "src/quiche/web_transport/complete_buffer_visitor.h", "src/quiche/web_transport/encapsulated/encapsulated_web_transport.h",
diff --git a/build/source_list.json b/build/source_list.json index a6360b6..d7de1c5 100644 --- a/build/source_list.json +++ b/build/source_list.json
@@ -398,8 +398,6 @@ "quiche/spdy/core/hpack/hpack_decoder_adapter.h", "quiche/spdy/core/hpack/hpack_encoder.h", "quiche/spdy/core/spdy_bitmasks.h", - "quiche/spdy/core/spdy_frame_builder.h", - "quiche/spdy/core/spdy_framer.h", "quiche/spdy/core/spdy_protocol.h", "quiche/web_transport/complete_buffer_visitor.h", "quiche/web_transport/encapsulated/encapsulated_web_transport.h",
diff --git a/quiche/http2/adapter/oghttp2_session.h b/quiche/http2/adapter/oghttp2_session.h index 523fe50..7e9841d 100644 --- a/quiche/http2/adapter/oghttp2_session.h +++ b/quiche/http2/adapter/oghttp2_session.h
@@ -24,6 +24,7 @@ #include "quiche/http2/core/http2_trace_logging.h" #include "quiche/http2/core/no_op_headers_handler.h" #include "quiche/http2/core/priority_write_scheduler.h" +#include "quiche/http2/core/spdy_framer.h" #include "quiche/common/http/http_header_block.h" #include "quiche/common/platform/api/quiche_bug_tracker.h" #include "quiche/common/platform/api/quiche_export.h" @@ -31,7 +32,6 @@ #include "quiche/common/quiche_callbacks.h" #include "quiche/common/quiche_circular_deque.h" #include "quiche/common/quiche_linked_hash_map.h" -#include "quiche/spdy/core/spdy_framer.h" #include "quiche/spdy/core/spdy_protocol.h" namespace http2 {
diff --git a/quiche/http2/adapter/test_frame_sequence.cc b/quiche/http2/adapter/test_frame_sequence.cc index a099082..5a2593a 100644 --- a/quiche/http2/adapter/test_frame_sequence.cc +++ b/quiche/http2/adapter/test_frame_sequence.cc
@@ -8,8 +8,8 @@ #include "quiche/http2/adapter/http2_util.h" #include "quiche/http2/adapter/oghttp2_util.h" +#include "quiche/http2/core/spdy_framer.h" #include "quiche/http2/hpack/hpack_encoder.h" -#include "quiche/spdy/core/spdy_framer.h" namespace http2 { namespace adapter {
diff --git a/quiche/http2/adapter/test_utils_test.cc b/quiche/http2/adapter/test_utils_test.cc index 7ff2ede..62c9d6d 100644 --- a/quiche/http2/adapter/test_utils_test.cc +++ b/quiche/http2/adapter/test_utils_test.cc
@@ -4,8 +4,8 @@ #include <string> #include <utility> +#include "quiche/http2/core/spdy_framer.h" #include "quiche/common/platform/api/quiche_test.h" -#include "quiche/spdy/core/spdy_framer.h" namespace http2 { namespace adapter {
diff --git a/quiche/quic/core/http/quic_headers_stream.h b/quiche/quic/core/http/quic_headers_stream.h index 789b0ae..b0c5867 100644 --- a/quiche/quic/core/http/quic_headers_stream.h +++ b/quiche/quic/core/http/quic_headers_stream.h
@@ -8,11 +8,11 @@ #include <cstddef> #include <memory> +#include "quiche/http2/core/spdy_framer.h" #include "quiche/quic/core/http/quic_header_list.h" #include "quiche/quic/core/quic_packets.h" #include "quiche/quic/core/quic_stream.h" #include "quiche/quic/platform/api/quic_export.h" -#include "quiche/spdy/core/spdy_framer.h" namespace quic {
diff --git a/quiche/quic/core/http/quic_spdy_client_stream.h b/quiche/quic/core/http/quic_spdy_client_stream.h index d5df1a6..e8537bf 100644 --- a/quiche/quic/core/http/quic_spdy_client_stream.h +++ b/quiche/quic/core/http/quic_spdy_client_stream.h
@@ -10,10 +10,10 @@ #include <string> #include "absl/strings/string_view.h" +#include "quiche/http2/core/spdy_framer.h" #include "quiche/quic/core/http/quic_spdy_stream.h" #include "quiche/quic/core/quic_packets.h" #include "quiche/common/http/http_header_block.h" -#include "quiche/spdy/core/spdy_framer.h" namespace quic {
diff --git a/quiche/quic/core/http/quic_spdy_session_test.cc b/quiche/quic/core/http/quic_spdy_session_test.cc index 7faed39..ad90298 100644 --- a/quiche/quic/core/http/quic_spdy_session_test.cc +++ b/quiche/quic/core/http/quic_spdy_session_test.cc
@@ -17,6 +17,7 @@ #include "absl/strings/escaping.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" +#include "quiche/http2/core/spdy_framer.h" #include "quiche/quic/core/crypto/crypto_protocol.h" #include "quiche/quic/core/frames/quic_stream_frame.h" #include "quiche/quic/core/frames/quic_streams_blocked_frame.h" @@ -51,7 +52,6 @@ #include "quiche/common/platform/api/quiche_mem_slice.h" #include "quiche/common/quiche_endian.h" #include "quiche/common/test_tools/quiche_test_utils.h" -#include "quiche/spdy/core/spdy_framer.h" using quiche::HttpHeaderBlock; using spdy::kV3HighestPriority;
diff --git a/quiche/quic/core/http/quic_spdy_stream.h b/quiche/quic/core/http/quic_spdy_stream.h index d39919c..fb6dc2c 100644 --- a/quiche/quic/core/http/quic_spdy_stream.h +++ b/quiche/quic/core/http/quic_spdy_stream.h
@@ -20,6 +20,7 @@ #include "absl/base/attributes.h" #include "absl/strings/string_view.h" #include "absl/types/span.h" +#include "quiche/http2/core/spdy_framer.h" #include "quiche/quic/core/http/http_decoder.h" #include "quiche/quic/core/http/http_encoder.h" #include "quiche/quic/core/http/metadata_decoder.h" @@ -41,7 +42,6 @@ #include "quiche/common/capsule.h" #include "quiche/common/http/http_header_block.h" #include "quiche/common/platform/api/quiche_mem_slice.h" -#include "quiche/spdy/core/spdy_framer.h" namespace quic {
diff --git a/quiche/quic/test_tools/quic_spdy_session_peer.h b/quiche/quic/test_tools/quic_spdy_session_peer.h index 2edf3e4..ee80816 100644 --- a/quiche/quic/test_tools/quic_spdy_session_peer.h +++ b/quiche/quic/test_tools/quic_spdy_session_peer.h
@@ -5,6 +5,7 @@ #ifndef QUICHE_QUIC_TEST_TOOLS_QUIC_SPDY_SESSION_PEER_H_ #define QUICHE_QUIC_TEST_TOOLS_QUIC_SPDY_SESSION_PEER_H_ +#include "quiche/http2/core/spdy_framer.h" #include "quiche/quic/core/http/quic_receive_control_stream.h" #include "quiche/quic/core/http/quic_send_control_stream.h" #include "quiche/quic/core/http/quic_spdy_session.h" @@ -13,7 +14,6 @@ #include "quiche/quic/core/quic_packets.h" #include "quiche/quic/core/quic_write_blocked_list.h" #include "quiche/common/http/http_header_block.h" -#include "quiche/spdy/core/spdy_framer.h" namespace quic {
diff --git a/quiche/quic/test_tools/quic_test_utils.cc b/quiche/quic/test_tools/quic_test_utils.cc index e3ec0a2..a2d0798 100644 --- a/quiche/quic/test_tools/quic_test_utils.cc +++ b/quiche/quic/test_tools/quic_test_utils.cc
@@ -43,7 +43,6 @@ #include "quiche/common/quiche_buffer_allocator.h" #include "quiche/common/quiche_endian.h" #include "quiche/common/simple_buffer_allocator.h" -#include "quiche/spdy/core/spdy_frame_builder.h" using testing::_; using testing::Invoke;
diff --git a/quiche/quic/tools/quic_memory_cache_backend.h b/quiche/quic/tools/quic_memory_cache_backend.h index 84456a8..33c7f8a 100644 --- a/quiche/quic/tools/quic_memory_cache_backend.h +++ b/quiche/quic/tools/quic_memory_cache_backend.h
@@ -12,12 +12,12 @@ #include "absl/container/flat_hash_map.h" #include "absl/strings/string_view.h" +#include "quiche/http2/core/spdy_framer.h" #include "quiche/quic/core/http/spdy_utils.h" #include "quiche/quic/tools/quic_backend_response.h" #include "quiche/quic/tools/quic_simple_server_backend.h" #include "quiche/common/http/http_header_block.h" #include "quiche/common/platform/api/quiche_mutex.h" -#include "quiche/spdy/core/spdy_framer.h" namespace quic {
diff --git a/quiche/quic/tools/quic_simple_server_stream.h b/quiche/quic/tools/quic_simple_server_stream.h index 3e9a691..689f644 100644 --- a/quiche/quic/tools/quic_simple_server_stream.h +++ b/quiche/quic/tools/quic_simple_server_stream.h
@@ -9,13 +9,13 @@ #include <optional> #include "absl/strings/string_view.h" +#include "quiche/http2/core/spdy_framer.h" #include "quiche/quic/core/http/quic_spdy_server_stream_base.h" #include "quiche/quic/core/quic_error_codes.h" #include "quiche/quic/core/quic_packets.h" #include "quiche/quic/tools/quic_backend_response.h" #include "quiche/quic/tools/quic_simple_server_backend.h" #include "quiche/common/http/http_header_block.h" -#include "quiche/spdy/core/spdy_framer.h" namespace quic {
diff --git a/quiche/spdy/core/spdy_frame_builder.h b/quiche/spdy/core/spdy_frame_builder.h deleted file mode 100644 index f8f749b..0000000 --- a/quiche/spdy/core/spdy_frame_builder.h +++ /dev/null
@@ -1,10 +0,0 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef QUICHE_SPDY_CORE_SPDY_FRAME_BUILDER_H_ -#define QUICHE_SPDY_CORE_SPDY_FRAME_BUILDER_H_ - -#include "quiche/http2/core/spdy_frame_builder.h" - -#endif // QUICHE_SPDY_CORE_SPDY_FRAME_BUILDER_H_
diff --git a/quiche/spdy/core/spdy_framer.h b/quiche/spdy/core/spdy_framer.h deleted file mode 100644 index 15fb6e6..0000000 --- a/quiche/spdy/core/spdy_framer.h +++ /dev/null
@@ -1,10 +0,0 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef QUICHE_SPDY_CORE_SPDY_FRAMER_H_ -#define QUICHE_SPDY_CORE_SPDY_FRAMER_H_ - -#include "quiche/http2/core/spdy_framer.h" - -#endif // QUICHE_SPDY_CORE_SPDY_FRAMER_H_