Migrates all users of spdy::Http2HeaderBlock to quiche::HttpHeaderBlock.
The former is merely an alias for the latter, so this is not a functional change.
Tested:
TAP train for global presubmit queue
http://test/OCL:651173229:BASE:651151888:1720677730395:bc35510f
Protected by refactoring, no functional change, not protected.
PiperOrigin-RevId: 651457030
diff --git a/quiche/quic/test_tools/quic_spdy_session_peer.cc b/quiche/quic/test_tools/quic_spdy_session_peer.cc
index f42d9ae..ac2567a 100644
--- a/quiche/quic/test_tools/quic_spdy_session_peer.cc
+++ b/quiche/quic/test_tools/quic_spdy_session_peer.cc
@@ -49,7 +49,7 @@
// static
size_t QuicSpdySessionPeer::WriteHeadersOnHeadersStream(
- QuicSpdySession* session, QuicStreamId id, spdy::Http2HeaderBlock headers,
+ QuicSpdySession* session, QuicStreamId id, quiche::HttpHeaderBlock headers,
bool fin, const spdy::SpdyStreamPrecedence& precedence,
quiche::QuicheReferenceCountedPointer<QuicAckListenerInterface>
ack_listener) {
diff --git a/quiche/quic/test_tools/quic_spdy_session_peer.h b/quiche/quic/test_tools/quic_spdy_session_peer.h
index 87d38ee..2edf3e4 100644
--- a/quiche/quic/test_tools/quic_spdy_session_peer.h
+++ b/quiche/quic/test_tools/quic_spdy_session_peer.h
@@ -12,7 +12,7 @@
#include "quiche/quic/core/qpack/qpack_send_stream.h"
#include "quiche/quic/core/quic_packets.h"
#include "quiche/quic/core/quic_write_blocked_list.h"
-#include "quiche/spdy/core/http2_header_block.h"
+#include "quiche/common/http/http_header_block.h"
#include "quiche/spdy/core/spdy_framer.h"
namespace quic {
@@ -33,8 +33,9 @@
static void SetMaxInboundHeaderListSize(QuicSpdySession* session,
size_t max_inbound_header_size);
static size_t WriteHeadersOnHeadersStream(
- QuicSpdySession* session, QuicStreamId id, spdy::Http2HeaderBlock headers,
- bool fin, const spdy::SpdyStreamPrecedence& precedence,
+ QuicSpdySession* session, QuicStreamId id,
+ quiche::HttpHeaderBlock headers, bool fin,
+ const spdy::SpdyStreamPrecedence& precedence,
quiche::QuicheReferenceCountedPointer<QuicAckListenerInterface>
ack_listener);
// |session| can't be nullptr.
diff --git a/quiche/quic/test_tools/quic_test_backend.cc b/quiche/quic/test_tools/quic_test_backend.cc
index a37ff36..93e7e44 100644
--- a/quiche/quic/test_tools/quic_test_backend.cc
+++ b/quiche/quic/test_tools/quic_test_backend.cc
@@ -73,7 +73,7 @@
QuicSimpleServerBackend::WebTransportResponse
QuicTestBackend::ProcessWebTransportRequest(
- const spdy::Http2HeaderBlock& request_headers,
+ const quiche::HttpHeaderBlock& request_headers,
WebTransportSession* session) {
if (!SupportsWebTransport()) {
return QuicSimpleServerBackend::ProcessWebTransportRequest(request_headers,
diff --git a/quiche/quic/test_tools/quic_test_backend.h b/quiche/quic/test_tools/quic_test_backend.h
index e59eb91..75b03d2 100644
--- a/quiche/quic/test_tools/quic_test_backend.h
+++ b/quiche/quic/test_tools/quic_test_backend.h
@@ -6,8 +6,8 @@
#define QUICHE_QUIC_TEST_TOOLS_QUIC_TEST_BACKEND_H_
#include "quiche/quic/tools/quic_memory_cache_backend.h"
+#include "quiche/common/http/http_header_block.h"
#include "quiche/common/platform/api/quiche_logging.h"
-#include "quiche/spdy/core/http2_header_block.h"
namespace quic {
namespace test {
@@ -18,7 +18,7 @@
class QuicTestBackend : public QuicMemoryCacheBackend {
public:
WebTransportResponse ProcessWebTransportRequest(
- const spdy::Http2HeaderBlock& request_headers,
+ const quiche::HttpHeaderBlock& request_headers,
WebTransportSession* session) override;
bool SupportsWebTransport() override { return enable_webtransport_; }
diff --git a/quiche/quic/test_tools/quic_test_client.cc b/quiche/quic/test_tools/quic_test_client.cc
index 198906b..aba6fc0 100644
--- a/quiche/quic/test_tools/quic_test_client.cc
+++ b/quiche/quic/test_tools/quic_test_client.cc
@@ -381,7 +381,7 @@
}
int64_t QuicTestClient::SendRequest(const std::string& uri) {
- spdy::Http2HeaderBlock headers;
+ quiche::HttpHeaderBlock headers;
if (!PopulateHeaderBlockFromUrl(uri, &headers)) {
return 0;
}
@@ -389,7 +389,7 @@
}
int64_t QuicTestClient::SendRequestAndRstTogether(const std::string& uri) {
- spdy::Http2HeaderBlock headers;
+ quiche::HttpHeaderBlock headers;
if (!PopulateHeaderBlockFromUrl(uri, &headers)) {
return 0;
}
@@ -414,7 +414,7 @@
}
int64_t QuicTestClient::GetOrCreateStreamAndSendRequest(
- const spdy::Http2HeaderBlock* headers, absl::string_view body, bool fin,
+ const quiche::HttpHeaderBlock* headers, absl::string_view body, bool fin,
quiche::QuicheReferenceCountedPointer<QuicAckListenerInterface>
ack_listener) {
// Maybe it's better just to overload this. it's just that we need
@@ -428,7 +428,7 @@
int64_t ret = 0;
if (headers != nullptr) {
- spdy::Http2HeaderBlock spdy_headers(headers->Clone());
+ quiche::HttpHeaderBlock spdy_headers(headers->Clone());
if (spdy_headers[":authority"].as_string().empty()) {
spdy_headers[":authority"] = client_->server_id().host();
}
@@ -441,17 +441,17 @@
return ret;
}
-int64_t QuicTestClient::SendMessage(const spdy::Http2HeaderBlock& headers,
+int64_t QuicTestClient::SendMessage(const quiche::HttpHeaderBlock& headers,
absl::string_view body) {
return SendMessage(headers, body, /*fin=*/true);
}
-int64_t QuicTestClient::SendMessage(const spdy::Http2HeaderBlock& headers,
+int64_t QuicTestClient::SendMessage(const quiche::HttpHeaderBlock& headers,
absl::string_view body, bool fin) {
return SendMessage(headers, body, fin, /*flush=*/true);
}
-int64_t QuicTestClient::SendMessage(const spdy::Http2HeaderBlock& headers,
+int64_t QuicTestClient::SendMessage(const quiche::HttpHeaderBlock& headers,
absl::string_view body, bool fin,
bool flush) {
// Always force creation of a stream for SendMessage.
@@ -492,7 +492,7 @@
const std::string& QuicTestClient::response_body() const { return response_; }
std::string QuicTestClient::SendCustomSynchronousRequest(
- const spdy::Http2HeaderBlock& headers, const std::string& body) {
+ const quiche::HttpHeaderBlock& headers, const std::string& body) {
// Clear connection state here and only track this synchronous request.
ClearPerConnectionState();
if (SendMessage(headers, body) == 0) {
@@ -507,7 +507,7 @@
}
std::string QuicTestClient::SendSynchronousRequest(const std::string& uri) {
- spdy::Http2HeaderBlock headers;
+ quiche::HttpHeaderBlock headers;
if (!PopulateHeaderBlockFromUrl(uri, &headers)) {
return "";
}
@@ -656,7 +656,7 @@
return response_headers_complete_;
}
-const spdy::Http2HeaderBlock* QuicTestClient::response_headers() const {
+const quiche::HttpHeaderBlock* QuicTestClient::response_headers() const {
for (std::pair<QuicStreamId, QuicSpdyClientStream*> stream : open_streams_) {
if (stream.second->headers_decompressed()) {
response_headers_ = stream.second->response_headers().Clone();
@@ -666,7 +666,7 @@
return &response_headers_;
}
-const spdy::Http2HeaderBlock& QuicTestClient::response_trailers() const {
+const quiche::HttpHeaderBlock& QuicTestClient::response_trailers() const {
return response_trailers_;
}
@@ -803,8 +803,9 @@
QuicTestClient::PerStreamState::PerStreamState(
QuicRstStreamErrorCode stream_error, bool response_complete,
bool response_headers_complete,
- const spdy::Http2HeaderBlock& response_headers, const std::string& response,
- const spdy::Http2HeaderBlock& response_trailers, uint64_t bytes_read,
+ const quiche::HttpHeaderBlock& response_headers,
+ const std::string& response,
+ const quiche::HttpHeaderBlock& response_trailers, uint64_t bytes_read,
uint64_t bytes_written, int64_t response_body_size)
: stream_error(stream_error),
response_complete(response_complete),
@@ -819,7 +820,7 @@
QuicTestClient::PerStreamState::~PerStreamState() = default;
bool QuicTestClient::PopulateHeaderBlockFromUrl(
- const std::string& uri, spdy::Http2HeaderBlock* headers) {
+ const std::string& uri, quiche::HttpHeaderBlock* headers) {
std::string url;
if (absl::StartsWith(uri, "https://") || absl::StartsWith(uri, "http://")) {
url = uri;
diff --git a/quiche/quic/test_tools/quic_test_client.h b/quiche/quic/test_tools/quic_test_client.h
index 4920187..5091e23 100644
--- a/quiche/quic/test_tools/quic_test_client.h
+++ b/quiche/quic/test_tools/quic_test_client.h
@@ -17,9 +17,9 @@
#include "quiche/quic/core/quic_packets.h"
#include "quiche/quic/platform/api/quic_test.h"
#include "quiche/quic/tools/quic_default_client.h"
+#include "quiche/common/http/http_header_block.h"
#include "quiche/common/quiche_callbacks.h"
#include "quiche/common/quiche_linked_hash_map.h"
-#include "quiche/spdy/core/http2_header_block.h"
namespace quic {
@@ -169,23 +169,23 @@
const std::vector<std::string>& url_list);
// Sends a request containing |headers| and |body| and returns the number of
// bytes sent (the size of the serialized request headers and body).
- int64_t SendMessage(const spdy::Http2HeaderBlock& headers,
+ int64_t SendMessage(const quiche::HttpHeaderBlock& headers,
absl::string_view body);
// Sends a request containing |headers| and |body| with the fin bit set to
// |fin| and returns the number of bytes sent (the size of the serialized
// request headers and body).
- int64_t SendMessage(const spdy::Http2HeaderBlock& headers,
+ int64_t SendMessage(const quiche::HttpHeaderBlock& headers,
absl::string_view body, bool fin);
// Sends a request containing |headers| and |body| with the fin bit set to
// |fin| and returns the number of bytes sent (the size of the serialized
// request headers and body). If |flush| is true, will wait for the message to
// be flushed before returning.
- int64_t SendMessage(const spdy::Http2HeaderBlock& headers,
+ int64_t SendMessage(const quiche::HttpHeaderBlock& headers,
absl::string_view body, bool fin, bool flush);
// Sends a request containing |headers| and |body|, waits for the response,
// and returns the response body.
std::string SendCustomSynchronousRequest(
- const spdy::Http2HeaderBlock& headers, const std::string& body);
+ const quiche::HttpHeaderBlock& headers, const std::string& body);
// Sends a GET request for |uri|, waits for the response, and returns the
// response body.
std::string SendSynchronousRequest(const std::string& uri);
@@ -204,14 +204,14 @@
// Getters for stream state that only get updated once a complete response is
// received.
- const spdy::Http2HeaderBlock& response_trailers() const;
+ const quiche::HttpHeaderBlock& response_trailers() const;
bool response_complete() const;
int64_t response_body_size() const;
const std::string& response_body() const;
// Getters for stream state that return state of the oldest active stream that
// have received a partial response.
bool response_headers_complete() const;
- const spdy::Http2HeaderBlock* response_headers() const;
+ const quiche::HttpHeaderBlock* response_headers() const;
int64_t response_size() const;
size_t bytes_read() const;
size_t bytes_written() const;
@@ -296,7 +296,7 @@
// stores the request in case it needs to be resent. If |headers| is
// null, only the body will be sent on the stream.
int64_t GetOrCreateStreamAndSendRequest(
- const spdy::Http2HeaderBlock* headers, absl::string_view body, bool fin,
+ const quiche::HttpHeaderBlock* headers, absl::string_view body, bool fin,
quiche::QuicheReferenceCountedPointer<QuicAckListenerInterface>
ack_listener);
@@ -354,7 +354,7 @@
// request. If |uri| is a relative URL, the QuicServerId will be
// use to specify the authority.
bool PopulateHeaderBlockFromUrl(const std::string& uri,
- spdy::Http2HeaderBlock* headers);
+ quiche::HttpHeaderBlock* headers);
// Waits for a period of time that is long enough to receive all delayed acks
// sent by peer.
@@ -377,9 +377,9 @@
PerStreamState(const PerStreamState& other);
PerStreamState(QuicRstStreamErrorCode stream_error, bool response_complete,
bool response_headers_complete,
- const spdy::Http2HeaderBlock& response_headers,
+ const quiche::HttpHeaderBlock& response_headers,
const std::string& response,
- const spdy::Http2HeaderBlock& response_trailers,
+ const quiche::HttpHeaderBlock& response_trailers,
uint64_t bytes_read, uint64_t bytes_written,
int64_t response_body_size);
~PerStreamState();
@@ -387,9 +387,9 @@
QuicRstStreamErrorCode stream_error;
bool response_complete;
bool response_headers_complete;
- spdy::Http2HeaderBlock response_headers;
+ quiche::HttpHeaderBlock response_headers;
std::string response;
- spdy::Http2HeaderBlock response_trailers;
+ quiche::HttpHeaderBlock response_trailers;
uint64_t bytes_read;
uint64_t bytes_written;
int64_t response_body_size;
@@ -420,10 +420,10 @@
bool response_complete_;
bool response_headers_complete_;
- mutable spdy::Http2HeaderBlock response_headers_;
+ mutable quiche::HttpHeaderBlock response_headers_;
// Parsed response trailers (if present), copied from the stream in OnClose.
- spdy::Http2HeaderBlock response_trailers_;
+ quiche::HttpHeaderBlock response_trailers_;
spdy::SpdyPriority priority_;
std::string response_;
diff --git a/quiche/quic/test_tools/quic_test_utils.h b/quiche/quic/test_tools/quic_test_utils.h
index b87e901..276a2ac 100644
--- a/quiche/quic/test_tools/quic_test_utils.h
+++ b/quiche/quic/test_tools/quic_test_utils.h
@@ -47,8 +47,8 @@
#include "quiche/quic/test_tools/quic_framer_peer.h"
#include "quiche/quic/test_tools/simple_quic_framer.h"
#include "quiche/common/capsule.h"
+#include "quiche/common/http/http_header_block.h"
#include "quiche/common/simple_buffer_allocator.h"
-#include "quiche/spdy/core/http2_header_block.h"
namespace quic {
@@ -1047,7 +1047,7 @@
MOCK_METHOD(void, OnDataFrameSent, (QuicStreamId, QuicByteCount), (override));
MOCK_METHOD(void, OnHeadersFrameSent,
- (QuicStreamId, const spdy::Http2HeaderBlock&), (override));
+ (QuicStreamId, const quiche::HttpHeaderBlock&), (override));
MOCK_METHOD(void, OnSettingsFrameResumed, (const SettingsFrame&), (override));
};
diff --git a/quiche/quic/test_tools/web_transport_resets_backend.cc b/quiche/quic/test_tools/web_transport_resets_backend.cc
index 4a28ff5..4dc75ed 100644
--- a/quiche/quic/test_tools/web_transport_resets_backend.cc
+++ b/quiche/quic/test_tools/web_transport_resets_backend.cc
@@ -103,7 +103,7 @@
} // namespace
QuicSimpleServerBackend::WebTransportResponse WebTransportResetsBackend(
- const spdy::Http2HeaderBlock& /*request_headers*/,
+ const quiche::HttpHeaderBlock& /*request_headers*/,
WebTransportSession* session) {
QuicSimpleServerBackend::WebTransportResponse response;
response.response_headers[":status"] = "200";
diff --git a/quiche/quic/test_tools/web_transport_resets_backend.h b/quiche/quic/test_tools/web_transport_resets_backend.h
index c5ffbe0..c79bac3 100644
--- a/quiche/quic/test_tools/web_transport_resets_backend.h
+++ b/quiche/quic/test_tools/web_transport_resets_backend.h
@@ -6,7 +6,7 @@
#define QUICHE_QUIC_TEST_TOOLS_WEB_TRANSPORT_RESETS_BACKEND_H_
#include "quiche/quic/test_tools/quic_test_backend.h"
-#include "quiche/spdy/core/http2_header_block.h"
+#include "quiche/common/http/http_header_block.h"
namespace quic {
namespace test {
@@ -15,7 +15,7 @@
// bidirectional echo streams; whenever one of those receives RESET_STREAM or
// STOP_SENDING, a log message is sent as a unidirectional stream.
QuicSimpleServerBackend::WebTransportResponse WebTransportResetsBackend(
- const spdy::Http2HeaderBlock& request_headers,
+ const quiche::HttpHeaderBlock& request_headers,
WebTransportSession* session);
} // namespace test
