Merge different HTTP/3 QUIC version label into one called VersionUsesHttp3.
The current three labels are not actually incrementally dependent on others. For example, turning off VersionUsesQpack will cause multiple test failures.
And since HTTP/3 itself is fairly independent and self-contained. The code might as well live under one label.
gfe-relnote: protected by disabled v99 flag.
PiperOrigin-RevId: 274018355
Change-Id: I1926fb3fc5fc0a51f6678fed0ddf84b456104b8c
diff --git a/quic/tools/quic_simple_server_session_test.cc b/quic/tools/quic_simple_server_session_test.cc
index be2d0d6..08697d4 100644
--- a/quic/tools/quic_simple_server_session_test.cc
+++ b/quic/tools/quic_simple_server_session_test.cc
@@ -208,7 +208,7 @@
kInitialStreamFlowControlWindowForTest);
config_.SetInitialSessionFlowControlWindowToSend(
kInitialSessionFlowControlWindowForTest);
- if (VersionUsesQpack(GetParam().transport_version)) {
+ if (VersionUsesHttp3(GetParam().transport_version)) {
QuicConfigPeer::SetReceivedMaxIncomingUnidirectionalStreams(
&config_, kMaxStreamsForTest + 3);
} else {
@@ -481,7 +481,7 @@
EXPECT_EQ(1u, session_->GetNumOpenIncomingStreams());
EXPECT_EQ(0u, session_->GetNumOpenOutgoingStreams());
- if (!VersionUsesQpack(connection_->transport_version())) {
+ if (!VersionUsesHttp3(connection_->transport_version())) {
session_->UnregisterStreamPriority(
QuicUtils::GetHeadersStreamId(connection_->transport_version()),
/*is_static=*/true);
@@ -493,7 +493,7 @@
session_.get(), &stream_helper_);
crypto_stream->set_encryption_established(true);
QuicSimpleServerSessionPeer::SetCryptoStream(session_.get(), crypto_stream);
- if (!VersionUsesQpack(connection_->transport_version())) {
+ if (!VersionUsesHttp3(connection_->transport_version())) {
session_->RegisterStreamPriority(
QuicUtils::GetHeadersStreamId(connection_->transport_version()),
/*is_static=*/true,
@@ -505,7 +505,7 @@
QuicSpdyStream* created_stream =
QuicSimpleServerSessionPeer::CreateOutgoingUnidirectionalStream(
session_.get());
- if (VersionHasStreamType(connection_->transport_version())) {
+ if (VersionUsesHttp3(connection_->transport_version())) {
EXPECT_EQ(GetNthServerInitiatedUnidirectionalId(i + 3),
created_stream->id());
} else {
@@ -602,7 +602,7 @@
visitor_ = QuicConnectionPeer::GetVisitor(connection_);
- if (!VersionUsesQpack(connection_->transport_version())) {
+ if (!VersionUsesHttp3(connection_->transport_version())) {
session_->UnregisterStreamPriority(
QuicUtils::GetHeadersStreamId(connection_->transport_version()),
/*is_static=*/true);
@@ -615,7 +615,7 @@
crypto_stream->set_encryption_established(true);
QuicSimpleServerSessionPeer::SetCryptoStream(session_.get(), crypto_stream);
- if (!VersionUsesQpack(connection_->transport_version())) {
+ if (!VersionUsesHttp3(connection_->transport_version())) {
session_->RegisterStreamPriority(
QuicUtils::GetHeadersStreamId(connection_->transport_version()),
/*is_static=*/true,
@@ -644,7 +644,7 @@
QuicByteCount data_frame_header_length = 0;
for (unsigned int i = 1; i <= num_resources; ++i) {
QuicStreamId stream_id;
- if (VersionHasStreamType(connection_->transport_version())) {
+ if (VersionUsesHttp3(connection_->transport_version())) {
stream_id = GetNthServerInitiatedUnidirectionalId(i + 2);
} else {
stream_id = GetNthServerInitiatedUnidirectionalId(i - 1);
@@ -656,7 +656,7 @@
std::string body(body_size, 'a');
std::string data;
data_frame_header_length = 0;
- if (VersionHasDataFrameHeader(connection_->transport_version())) {
+ if (VersionUsesHttp3(connection_->transport_version())) {
HttpEncoder encoder;
std::unique_ptr<char[]> buffer;
data_frame_header_length =
@@ -680,13 +680,13 @@
// Since flow control window is smaller than response body, not the
// whole body will be sent.
QuicStreamOffset offset = 0;
- if (VersionHasStreamType(connection_->transport_version())) {
+ if (VersionUsesHttp3(connection_->transport_version())) {
EXPECT_CALL(*connection_,
SendStreamData(stream_id, 1, offset, NO_FIN));
offset++;
}
- if (VersionUsesQpack(connection_->transport_version())) {
+ if (VersionUsesHttp3(connection_->transport_version())) {
EXPECT_CALL(*connection_,
SendStreamData(stream_id, kHeadersFrameHeaderLength,
offset, NO_FIN));
@@ -696,7 +696,7 @@
offset, NO_FIN));
offset += kHeadersFramePayloadLength;
}
- if (VersionHasDataFrameHeader(connection_->transport_version())) {
+ if (VersionUsesHttp3(connection_->transport_version())) {
EXPECT_CALL(*connection_,
SendStreamData(stream_id, data_frame_header_length,
offset, NO_FIN));
@@ -716,7 +716,7 @@
}
void MaybeConsumeHeadersStreamData() {
- if (!VersionUsesQpack(connection_->transport_version())) {
+ if (!VersionUsesHttp3(connection_->transport_version())) {
QuicStreamId headers_stream_id =
QuicUtils::GetHeadersStreamId(connection_->transport_version());
EXPECT_CALL(*connection_, SendStreamData(headers_stream_id, _, _, _))
@@ -749,7 +749,7 @@
size_t num_resources = kMaxStreamsForTest + 1;
QuicByteCount data_frame_header_length = PromisePushResources(num_resources);
QuicStreamId next_out_going_stream_id;
- if (VersionHasStreamType(connection_->transport_version())) {
+ if (VersionUsesHttp3(connection_->transport_version())) {
next_out_going_stream_id =
GetNthServerInitiatedUnidirectionalId(kMaxStreamsForTest + 3);
} else {
@@ -760,12 +760,12 @@
// After an open stream is marked draining, a new stream is expected to be
// created and a response sent on the stream.
QuicStreamOffset offset = 0;
- if (VersionHasStreamType(connection_->transport_version())) {
+ if (VersionUsesHttp3(connection_->transport_version())) {
EXPECT_CALL(*connection_,
SendStreamData(next_out_going_stream_id, 1, offset, NO_FIN));
offset++;
}
- if (VersionUsesQpack(connection_->transport_version())) {
+ if (VersionUsesHttp3(connection_->transport_version())) {
EXPECT_CALL(*connection_,
SendStreamData(next_out_going_stream_id,
kHeadersFrameHeaderLength, offset, NO_FIN));
@@ -775,7 +775,7 @@
kHeadersFramePayloadLength, offset, NO_FIN));
offset += kHeadersFramePayloadLength;
}
- if (VersionHasDataFrameHeader(connection_->transport_version())) {
+ if (VersionUsesHttp3(connection_->transport_version())) {
EXPECT_CALL(*connection_,
SendStreamData(next_out_going_stream_id,
data_frame_header_length, offset, NO_FIN));
@@ -799,7 +799,7 @@
QuicMaxStreamsFrame(0, num_resources + 3, /*unidirectional=*/true));
}
- if (VersionHasStreamType(connection_->transport_version())) {
+ if (VersionUsesHttp3(connection_->transport_version())) {
session_->StreamDraining(GetNthServerInitiatedUnidirectionalId(3));
} else {
session_->StreamDraining(GetNthServerInitiatedUnidirectionalId(0));
@@ -830,7 +830,7 @@
// Reset the last stream in the queue. It should be marked cancelled.
QuicStreamId stream_got_reset;
- if (VersionHasStreamType(connection_->transport_version())) {
+ if (VersionUsesHttp3(connection_->transport_version())) {
stream_got_reset =
GetNthServerInitiatedUnidirectionalId(kMaxStreamsForTest + 4);
} else {
@@ -850,7 +850,7 @@
// be created. But since one of them was marked cancelled due to RST frame,
// only one queued resource will be sent out.
QuicStreamId stream_not_reset;
- if (VersionHasStreamType(connection_->transport_version())) {
+ if (VersionUsesHttp3(connection_->transport_version())) {
stream_not_reset =
GetNthServerInitiatedUnidirectionalId(kMaxStreamsForTest + 3);
} else {
@@ -859,12 +859,12 @@
}
InSequence s;
QuicStreamOffset offset = 0;
- if (VersionHasStreamType(connection_->transport_version())) {
+ if (VersionUsesHttp3(connection_->transport_version())) {
EXPECT_CALL(*connection_,
SendStreamData(stream_not_reset, 1, offset, NO_FIN));
offset++;
}
- if (VersionUsesQpack(connection_->transport_version())) {
+ if (VersionUsesHttp3(connection_->transport_version())) {
EXPECT_CALL(*connection_,
SendStreamData(stream_not_reset, kHeadersFrameHeaderLength,
offset, NO_FIN));
@@ -874,7 +874,7 @@
offset, NO_FIN));
offset += kHeadersFramePayloadLength;
}
- if (VersionHasDataFrameHeader(connection_->transport_version())) {
+ if (VersionUsesHttp3(connection_->transport_version())) {
EXPECT_CALL(*connection_,
SendStreamData(stream_not_reset, data_frame_header_length,
offset, NO_FIN));
@@ -914,7 +914,7 @@
}
QuicByteCount data_frame_header_length = PromisePushResources(num_resources);
QuicStreamId stream_to_open;
- if (VersionHasStreamType(connection_->transport_version())) {
+ if (VersionUsesHttp3(connection_->transport_version())) {
stream_to_open =
GetNthServerInitiatedUnidirectionalId(kMaxStreamsForTest + 3);
} else {
@@ -932,12 +932,12 @@
OnStreamReset(stream_got_reset, QUIC_RST_ACKNOWLEDGEMENT));
}
QuicStreamOffset offset = 0;
- if (VersionHasStreamType(connection_->transport_version())) {
+ if (VersionUsesHttp3(connection_->transport_version())) {
EXPECT_CALL(*connection_,
SendStreamData(stream_to_open, 1, offset, NO_FIN));
offset++;
}
- if (VersionUsesQpack(connection_->transport_version())) {
+ if (VersionUsesHttp3(connection_->transport_version())) {
EXPECT_CALL(*connection_,
SendStreamData(stream_to_open, kHeadersFrameHeaderLength,
offset, NO_FIN));
@@ -947,7 +947,7 @@
offset, NO_FIN));
offset += kHeadersFramePayloadLength;
}
- if (VersionHasDataFrameHeader(connection_->transport_version())) {
+ if (VersionUsesHttp3(connection_->transport_version())) {
EXPECT_CALL(*connection_,
SendStreamData(stream_to_open, data_frame_header_length, offset,
NO_FIN));
diff --git a/quic/tools/quic_simple_server_stream_test.cc b/quic/tools/quic_simple_server_stream_test.cc
index 72c3201..783dba0 100644
--- a/quic/tools/quic_simple_server_stream_test.cc
+++ b/quic/tools/quic_simple_server_stream_test.cc
@@ -230,8 +230,8 @@
return (*stream_->mutable_headers())[key].as_string();
}
- bool HasFrameHeader() const {
- return VersionHasDataFrameHeader(connection_->transport_version());
+ bool UsesHttp3() const {
+ return VersionUsesHttp3(connection_->transport_version());
}
spdy::SpdyHeaderBlock response_headers_;
@@ -264,7 +264,7 @@
QuicByteCount header_length =
encoder_.SerializeDataFrameHeader(body_.length(), &buffer);
std::string header = std::string(buffer.get(), header_length);
- std::string data = HasFrameHeader() ? header + body_ : body_;
+ std::string data = UsesHttp3() ? header + body_ : body_;
stream_->OnStreamFrame(
QuicStreamFrame(stream_->id(), /*fin=*/false, /*offset=*/0, data));
EXPECT_EQ("11", StreamHeadersValue("content-length"));
@@ -282,7 +282,7 @@
QuicByteCount header_length =
encoder_.SerializeDataFrameHeader(body_.length(), &buffer);
std::string header = std::string(buffer.get(), header_length);
- std::string data = HasFrameHeader() ? header + body_ : body_;
+ std::string data = UsesHttp3() ? header + body_ : body_;
stream_->OnStreamFrame(
QuicStreamFrame(stream_->id(), /*fin=*/false, /*offset=*/0, data));
EXPECT_EQ("11", StreamHeadersValue("content-length"));
@@ -311,7 +311,7 @@
// We'll automatically write out an error (headers + body)
EXPECT_CALL(*stream_, WriteHeadersMock(false));
- if (HasFrameHeader()) {
+ if (UsesHttp3()) {
EXPECT_CALL(session_, WritevData(_, _, kDataFrameHeaderLength, _, NO_FIN));
}
EXPECT_CALL(session_, WritevData(_, _, kErrorLength, _, FIN));
@@ -323,7 +323,7 @@
QuicByteCount header_length =
encoder_.SerializeDataFrameHeader(body_.length(), &buffer);
std::string header = std::string(buffer.get(), header_length);
- std::string data = HasFrameHeader() ? header + body_ : body_;
+ std::string data = UsesHttp3() ? header + body_ : body_;
stream_->OnStreamFrame(
QuicStreamFrame(stream_->id(), /*fin=*/false, /*offset=*/0, data));
@@ -332,7 +332,7 @@
header_length =
encoder_.SerializeDataFrameHeader(large_body.length(), &buffer);
header = std::string(buffer.get(), header_length);
- std::string data2 = HasFrameHeader() ? header + large_body : large_body;
+ std::string data2 = UsesHttp3() ? header + large_body : large_body;
stream_->OnStreamFrame(
QuicStreamFrame(stream_->id(), /*fin=*/true, data.size(), data2));
EXPECT_EQ("11", StreamHeadersValue("content-length"));
@@ -364,7 +364,7 @@
InSequence s;
EXPECT_CALL(*stream_, WriteHeadersMock(false));
- if (HasFrameHeader()) {
+ if (UsesHttp3()) {
EXPECT_CALL(session_, WritevData(_, _, header_length, _, NO_FIN));
}
EXPECT_CALL(session_, WritevData(_, _, kErrorLength, _, FIN));
@@ -399,7 +399,7 @@
InSequence s;
EXPECT_CALL(*stream_, WriteHeadersMock(false));
- if (HasFrameHeader()) {
+ if (UsesHttp3()) {
EXPECT_CALL(session_, WritevData(_, _, header_length, _, NO_FIN));
}
EXPECT_CALL(session_, WritevData(_, _, kErrorLength, _, FIN));
@@ -463,7 +463,7 @@
InSequence s;
EXPECT_CALL(*stream_, WriteHeadersMock(false));
- if (HasFrameHeader()) {
+ if (UsesHttp3()) {
EXPECT_CALL(session_, WritevData(_, _, header_length, _, NO_FIN));
}
EXPECT_CALL(session_, WritevData(_, _, body.length(), _, FIN));
@@ -506,7 +506,7 @@
connection_->transport_version(), 0),
_, _));
EXPECT_CALL(*stream_, WriteHeadersMock(false));
- if (HasFrameHeader()) {
+ if (UsesHttp3()) {
EXPECT_CALL(session_, WritevData(_, _, header_length, _, NO_FIN));
}
EXPECT_CALL(session_, WritevData(_, _, body.length(), _, FIN));
@@ -564,7 +564,7 @@
InSequence s;
EXPECT_CALL(*server_initiated_stream, WriteHeadersMock(false));
- if (HasFrameHeader()) {
+ if (UsesHttp3()) {
EXPECT_CALL(session_, WritevData(_, kServerInitiatedStreamId, header_length,
_, NO_FIN));
}
@@ -582,7 +582,7 @@
InSequence s;
EXPECT_CALL(*stream_, WriteHeadersMock(false));
- if (HasFrameHeader()) {
+ if (UsesHttp3()) {
EXPECT_CALL(session_, WritevData(_, _, kDataFrameHeaderLength, _, NO_FIN));
}
EXPECT_CALL(session_, WritevData(_, _, kErrorLength, _, FIN));
