Migrates code from `//third_party/spdy/core:http2_deframer_lib` to `//third_party/http2/core:http2_frame_decoder_adapter`. Protected by refactoring, no functional change; not protected. PiperOrigin-RevId: 678835480
diff --git a/build/source_list.bzl b/build/source_list.bzl index bce0f0f..209b65f 100644 --- a/build/source_list.bzl +++ b/build/source_list.bzl
@@ -398,7 +398,6 @@ "quic/platform/api/quic_thread.h", "spdy/core/hpack/hpack_decoder_adapter.h", "spdy/core/hpack/hpack_encoder.h", - "spdy/core/http2_frame_decoder_adapter.h", "spdy/core/http2_header_block.h", "spdy/core/spdy_alt_svc_wire_format.h", "spdy/core/spdy_bitmasks.h",
diff --git a/build/source_list.gni b/build/source_list.gni index 9fe8d75..b4e93e8 100644 --- a/build/source_list.gni +++ b/build/source_list.gni
@@ -398,7 +398,6 @@ "src/quiche/quic/platform/api/quic_thread.h", "src/quiche/spdy/core/hpack/hpack_decoder_adapter.h", "src/quiche/spdy/core/hpack/hpack_encoder.h", - "src/quiche/spdy/core/http2_frame_decoder_adapter.h", "src/quiche/spdy/core/http2_header_block.h", "src/quiche/spdy/core/spdy_alt_svc_wire_format.h", "src/quiche/spdy/core/spdy_bitmasks.h",
diff --git a/build/source_list.json b/build/source_list.json index e02ea5d..fcf561f 100644 --- a/build/source_list.json +++ b/build/source_list.json
@@ -397,7 +397,6 @@ "quiche/quic/platform/api/quic_thread.h", "quiche/spdy/core/hpack/hpack_decoder_adapter.h", "quiche/spdy/core/hpack/hpack_encoder.h", - "quiche/spdy/core/http2_frame_decoder_adapter.h", "quiche/spdy/core/http2_header_block.h", "quiche/spdy/core/spdy_alt_svc_wire_format.h", "quiche/spdy/core/spdy_bitmasks.h",
diff --git a/quiche/http2/adapter/event_forwarder.h b/quiche/http2/adapter/event_forwarder.h index 36446f6..b380476 100644 --- a/quiche/http2/adapter/event_forwarder.h +++ b/quiche/http2/adapter/event_forwarder.h
@@ -3,9 +3,9 @@ #include <functional> +#include "quiche/http2/core/http2_frame_decoder_adapter.h" #include "quiche/common/platform/api/quiche_export.h" #include "quiche/common/quiche_callbacks.h" -#include "quiche/spdy/core/http2_frame_decoder_adapter.h" namespace http2 { namespace adapter {
diff --git a/quiche/http2/adapter/oghttp2_session.h b/quiche/http2/adapter/oghttp2_session.h index 2bd4c5f..523fe50 100644 --- a/quiche/http2/adapter/oghttp2_session.h +++ b/quiche/http2/adapter/oghttp2_session.h
@@ -20,6 +20,7 @@ #include "quiche/http2/adapter/http2_util.h" #include "quiche/http2/adapter/http2_visitor_interface.h" #include "quiche/http2/adapter/window_manager.h" +#include "quiche/http2/core/http2_frame_decoder_adapter.h" #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" @@ -30,7 +31,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/http2_frame_decoder_adapter.h" #include "quiche/spdy/core/spdy_framer.h" #include "quiche/spdy/core/spdy_protocol.h"
diff --git a/quiche/quic/core/http/quic_headers_stream_test.cc b/quiche/quic/core/http/quic_headers_stream_test.cc index 6df0607..47ce8cd 100644 --- a/quiche/quic/core/http/quic_headers_stream_test.cc +++ b/quiche/quic/core/http/quic_headers_stream_test.cc
@@ -14,6 +14,7 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" +#include "quiche/http2/core/http2_frame_decoder_adapter.h" #include "quiche/http2/core/recording_headers_handler.h" #include "quiche/http2/test_tools/spdy_test_utils.h" #include "quiche/quic/core/crypto/null_encrypter.h" @@ -31,7 +32,6 @@ #include "quiche/quic/test_tools/quic_test_utils.h" #include "quiche/common/http/http_header_block.h" #include "quiche/common/quiche_endian.h" -#include "quiche/spdy/core/http2_frame_decoder_adapter.h" #include "quiche/spdy/core/spdy_alt_svc_wire_format.h" #include "quiche/spdy/core/spdy_protocol.h"
diff --git a/quiche/quic/core/http/quic_spdy_session.cc b/quiche/quic/core/http/quic_spdy_session.cc index 13869f2..70e93eb 100644 --- a/quiche/quic/core/http/quic_spdy_session.cc +++ b/quiche/quic/core/http/quic_spdy_session.cc
@@ -18,6 +18,7 @@ #include "absl/strings/numbers.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" +#include "quiche/http2/core/http2_frame_decoder_adapter.h" #include "quiche/quic/core/http/http_constants.h" #include "quiche/quic/core/http/http_decoder.h" #include "quiche/quic/core/http/http_frames.h" @@ -36,7 +37,6 @@ #include "quiche/quic/platform/api/quic_logging.h" #include "quiche/quic/platform/api/quic_stack_trace.h" #include "quiche/common/platform/api/quiche_mem_slice.h" -#include "quiche/spdy/core/http2_frame_decoder_adapter.h" using http2::Http2DecoderAdapter; using quiche::HttpHeaderBlock;
diff --git a/quiche/quic/core/http/quic_spdy_session.h b/quiche/quic/core/http/quic_spdy_session.h index d56c99d..23aafd1 100644 --- a/quiche/quic/core/http/quic_spdy_session.h +++ b/quiche/quic/core/http/quic_spdy_session.h
@@ -15,6 +15,7 @@ #include "absl/container/flat_hash_map.h" #include "absl/container/flat_hash_set.h" #include "absl/strings/string_view.h" +#include "quiche/http2/core/http2_frame_decoder_adapter.h" #include "quiche/quic/core/http/http_frames.h" #include "quiche/quic/core/http/quic_header_list.h" #include "quiche/quic/core/http/quic_headers_stream.h" @@ -34,7 +35,6 @@ #include "quiche/quic/core/quic_versions.h" #include "quiche/quic/platform/api/quic_export.h" #include "quiche/common/http/http_header_block.h" -#include "quiche/spdy/core/http2_frame_decoder_adapter.h" namespace quic {
diff --git a/quiche/spdy/core/http2_frame_decoder_adapter.h b/quiche/spdy/core/http2_frame_decoder_adapter.h deleted file mode 100644 index dd78809..0000000 --- a/quiche/spdy/core/http2_frame_decoder_adapter.h +++ /dev/null
@@ -1,10 +0,0 @@ -// Copyright 2016 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_HTTP2_FRAME_DECODER_ADAPTER_H_ -#define QUICHE_SPDY_CORE_HTTP2_FRAME_DECODER_ADAPTER_H_ - -#include "quiche/http2/core/http2_frame_decoder_adapter.h" - -#endif // QUICHE_SPDY_CORE_HTTP2_FRAME_DECODER_ADAPTER_H_