Roll src/net/third_party/quiche/src/ bf0413d8c..5843bfd65 (22 commits)
https://quiche.googlesource.com/quiche.git/+log/bf0413d8c1d6..5843bfd65204
$ git log bf0413d8c..5843bfd65 --date=short --no-merges --format='%ad %ae %s'
2019-10-10 renjietang Fix GOAWAY max frame length.
2019-10-10 renjietang Merge different HTTP/3 QUIC version label into one called VersionUsesHttp3.
2019-10-10 fayang gfe-relnote: Do not send connection close when client receives a version negotiation packet. Not affect prod, not protected.
2019-10-10 fayang Automated g4 rollback of changelist 269791493.
2019-10-10 renjietang Run all QUIC versions in quic_stream_test.
2019-10-10 bnc Remove usages of QuicMakeUnique, Http2MakeUnique, SpdyMakeUnique.
2019-10-10 dschinazi Improve debug logging and test display
2019-10-09 nharper Use const uint8_t[] instead of vectors for QUIC initial obfuscation salts
2019-10-09 dschinazi Support local vs remote flow control with TLS, and fix initial limits
2019-10-09 dschinazi Use max TLS idle_timeout and use in session tests
2019-10-09 nharper gfe-relnote: Introduce QUIC_VERSION_50, protected by quic_enable_version_50
2019-10-09 nharper gfe-relnote: Expose properties of TLS connection in quic::CryptoNegotiatedParameters. Protected by quic_supports_tls_handshake.
2019-10-09 bnc Simplify QpackEncoderStreamSender API.
2019-10-08 dschinazi Deprecate quic_use_length_prefix_from_packet_info
2019-10-08 dschinazi Deprecate quic_framer_uses_undecryptable_upcall
2019-10-08 dschinazi Deprecate quic_use_hashed_stateless_reset_tokens
2019-10-08 vasilvv Refactor common QuicTransport constants into their own file.
2019-10-08 renjietang Add ToString to packet header enums.
2019-10-08 bnc Remove obsolete statement from quiche/README.md.
2019-10-08 bnc Coalesce QPACK encoder stream writes in QpackEncoderStreamSender.
2019-10-08 bnc Send Insert Count Increment instruction after decoding a header block if possible.
2019-10-07 renjietang Move connectivity probing related code from QuicFramer to QuicPacketCreator.
Created with:
roll-dep src/net/third_party/quiche/src
[email protected]
Change-Id: Ifac7287447b48a2dad870a64cf1c38f6e070dd33
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1857400
Reviewed-by: Ryan Hamilton <[email protected]>
Reviewed-by: Matt Menke <[email protected]>
Reviewed-by: Nico Weber <[email protected]>
Commit-Queue: Nico Weber <[email protected]>
Cr-Commit-Position: refs/heads/master@{#705469}
diff --git a/net/quic/bidirectional_stream_quic_impl.cc b/net/quic/bidirectional_stream_quic_impl.cc
index 5d7285e..19a6549f 100644
--- a/net/quic/bidirectional_stream_quic_impl.cc
+++ b/net/quic/bidirectional_stream_quic_impl.cc
@@ -216,7 +216,7 @@
// When QPACK is enabled, headers are sent and received on the stream, so
// the headers bytes do not need to be accounted for independently.
int64_t total_received_bytes =
- quic::VersionUsesQpack(session_->GetQuicVersion())
+ quic::VersionUsesHttp3(session_->GetQuicVersion())
? 0
: headers_bytes_received_;
if (stream_) {
@@ -232,7 +232,7 @@
int64_t BidirectionalStreamQuicImpl::GetTotalSentBytes() const {
// When QPACK is enabled, headers are sent and received on the stream, so
// the headers bytes do not need to be accounted for independently.
- int64_t total_sent_bytes = quic::VersionUsesQpack(session_->GetQuicVersion())
+ int64_t total_sent_bytes = quic::VersionUsesHttp3(session_->GetQuicVersion())
? 0
: headers_bytes_sent_;
if (stream_) {
diff --git a/net/quic/bidirectional_stream_quic_impl_unittest.cc b/net/quic/bidirectional_stream_quic_impl_unittest.cc
index 010d8afe..89e53f39 100644
--- a/net/quic/bidirectional_stream_quic_impl_unittest.cc
+++ b/net/quic/bidirectional_stream_quic_impl_unittest.cc
@@ -533,9 +533,9 @@
true /* owns_writer */, quic::Perspective::IS_CLIENT,
quic::test::SupportedVersions(version_));
if (connection_->version().KnowsWhichDecrypterToUse()) {
- connection_->InstallDecrypter(quic::ENCRYPTION_FORWARD_SECURE,
- quic::QuicMakeUnique<quic::NullDecrypter>(
- quic::Perspective::IS_CLIENT));
+ connection_->InstallDecrypter(
+ quic::ENCRYPTION_FORWARD_SECURE,
+ std::make_unique<quic::NullDecrypter>(quic::Perspective::IS_CLIENT));
}
base::TimeTicks dns_end = base::TimeTicks::Now();
base::TimeTicks dns_start = dns_end - base::TimeDelta::FromMilliseconds(1);
@@ -877,7 +877,7 @@
SetRequest("GET", "/", DEFAULT_PRIORITY);
size_t spdy_request_headers_frame_length;
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
AddWrite(ConstructInitialSettingsPacket());
AddWrite(ConstructRequestHeadersPacketInner(
GetNthClientInitiatedBidirectionalStreamId(0), kFin, DEFAULT_PRIORITY,
@@ -936,7 +936,7 @@
spdy::SpdyHeaderBlock trailers;
size_t spdy_trailers_frame_length;
trailers["foo"] = "bar";
- if (!quic::VersionUsesQpack(version_.transport_version)) {
+ if (!quic::VersionUsesHttp3(version_.transport_version)) {
trailers[quic::kFinalOffsetHeaderKey] =
base::NumberToString(strlen(kResponseBody));
}
@@ -980,7 +980,7 @@
TEST_P(BidirectionalStreamQuicImplTest, LoadTimingTwoRequests) {
SetRequest("GET", "/", DEFAULT_PRIORITY);
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
AddWrite(ConstructInitialSettingsPacket());
AddWrite(ConstructRequestHeadersPacketInner(
GetNthClientInitiatedBidirectionalStreamId(0), kFin, DEFAULT_PRIORITY,
@@ -1055,7 +1055,7 @@
SetRequest("POST", "/", DEFAULT_PRIORITY);
size_t spdy_request_headers_frame_length;
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
AddWrite(ConstructInitialSettingsPacket());
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_FORWARD_SECURE);
const char kBody1[] = "here are some data";
@@ -1162,7 +1162,7 @@
size_t spdy_trailers_frame_length;
spdy::SpdyHeaderBlock trailers;
trailers["foo"] = "bar";
- if (!quic::VersionUsesQpack(version_.transport_version)) {
+ if (!quic::VersionUsesHttp3(version_.transport_version)) {
trailers[quic::kFinalOffsetHeaderKey] =
base::NumberToString(strlen(kResponseBody));
}
@@ -1197,7 +1197,7 @@
SetRequest("POST", "/", DEFAULT_PRIORITY);
size_t spdy_request_headers_frame_length;
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
AddWrite(ConstructInitialSettingsPacket());
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_FORWARD_SECURE);
const char kBody1[] = "here are some data";
@@ -1281,7 +1281,7 @@
size_t spdy_trailers_frame_length;
spdy::SpdyHeaderBlock trailers;
trailers["foo"] = "bar";
- if (!quic::VersionUsesQpack(version_.transport_version)) {
+ if (!quic::VersionUsesHttp3(version_.transport_version)) {
trailers[quic::kFinalOffsetHeaderKey] =
base::NumberToString(strlen(kResponseBody));
}
@@ -1314,7 +1314,7 @@
SetRequest("POST", "/", DEFAULT_PRIORITY);
size_t spdy_request_headers_frame_length;
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
AddWrite(ConstructInitialSettingsPacket());
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_FORWARD_SECURE);
const char kBody1[] = "here are some data";
@@ -1415,7 +1415,7 @@
size_t spdy_trailers_frame_length;
spdy::SpdyHeaderBlock trailers;
trailers["foo"] = "bar";
- if (!quic::VersionUsesQpack(version_.transport_version)) {
+ if (!quic::VersionUsesHttp3(version_.transport_version)) {
trailers[quic::kFinalOffsetHeaderKey] =
base::NumberToString(strlen(kResponseBody));
}
@@ -1448,7 +1448,7 @@
TEST_P(BidirectionalStreamQuicImplTest,
SendDataWriteErrorCoalesceDataBufferAndHeaderFrame) {
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
AddWrite(ConstructInitialSettingsPacket());
AddWriteError(SYNCHRONOUS, ERR_CONNECTION_REFUSED);
@@ -1485,7 +1485,7 @@
TEST_P(BidirectionalStreamQuicImplTest,
SendvDataWriteErrorCoalesceDataBufferAndHeaderFrame) {
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
AddWrite(ConstructInitialSettingsPacket());
AddWriteError(SYNCHRONOUS, ERR_CONNECTION_REFUSED);
@@ -1525,7 +1525,7 @@
SetRequest("POST", "/", DEFAULT_PRIORITY);
size_t spdy_request_headers_frame_length;
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
AddWrite(ConstructInitialSettingsPacket());
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_FORWARD_SECURE);
AddWrite(ConstructRequestHeadersPacketInner(
@@ -1592,7 +1592,7 @@
size_t spdy_trailers_frame_length;
spdy::SpdyHeaderBlock trailers;
trailers["foo"] = "bar";
- if (!quic::VersionUsesQpack(version_.transport_version)) {
+ if (!quic::VersionUsesHttp3(version_.transport_version)) {
trailers[quic::kFinalOffsetHeaderKey] =
base::NumberToString(strlen(kResponseBody));
}
@@ -1621,7 +1621,7 @@
SetRequest("PUT", "/", DEFAULT_PRIORITY);
size_t spdy_request_headers_frame_length;
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
AddWrite(ConstructInitialSettingsPacket());
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_FORWARD_SECURE);
AddWrite(ConstructRequestHeadersPacketInner(
@@ -1689,7 +1689,7 @@
size_t spdy_trailers_frame_length;
spdy::SpdyHeaderBlock trailers;
trailers["foo"] = "bar";
- if (!quic::VersionUsesQpack(version_.transport_version)) {
+ if (!quic::VersionUsesHttp3(version_.transport_version)) {
trailers[quic::kFinalOffsetHeaderKey] =
base::NumberToString(strlen(kResponseBody));
}
@@ -1718,7 +1718,7 @@
SetRequest("POST", "/", DEFAULT_PRIORITY);
size_t spdy_request_headers_frame_length;
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
AddWrite(ConstructInitialSettingsPacket());
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_FORWARD_SECURE);
AddWrite(ConstructRequestHeadersPacketInner(
@@ -1782,7 +1782,7 @@
std::string header2 = ConstructDataHeader(strlen(kResponseBody));
// Server sends a data packet
int server_ack = 1;
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
server_ack++;
ProcessPacket(ConstructAckAndDataPacket(3, !kIncludeVersion, server_ack++, 1,
1, !kFin, header2 + kResponseBody,
@@ -1826,7 +1826,7 @@
SetRequest("GET", "/", DEFAULT_PRIORITY);
size_t spdy_request_headers_frame_length;
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
AddWrite(ConstructInitialSettingsPacket());
AddWrite(ConstructRequestHeadersPacketInner(
GetNthClientInitiatedBidirectionalStreamId(0), kFin, DEFAULT_PRIORITY,
@@ -1872,7 +1872,7 @@
SetRequest("GET", "/", DEFAULT_PRIORITY);
size_t spdy_request_headers_frame_length;
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
AddWrite(ConstructInitialSettingsPacket());
AddWrite(ConstructRequestHeadersPacketInner(
GetNthClientInitiatedBidirectionalStreamId(0), kFin, DEFAULT_PRIORITY,
@@ -1936,7 +1936,7 @@
SetRequest("POST", "/", DEFAULT_PRIORITY);
size_t spdy_request_headers_frame_length;
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
AddWrite(ConstructInitialSettingsPacket());
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_FORWARD_SECURE);
AddWrite(ConstructRequestHeadersPacketInner(
@@ -2047,7 +2047,7 @@
TEST_P(BidirectionalStreamQuicImplTest, SessionCloseDuringOnStreamReady) {
SetRequest("POST", "/", DEFAULT_PRIORITY);
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
AddWrite(ConstructInitialSettingsPacket());
AddWriteError(SYNCHRONOUS, ERR_CONNECTION_REFUSED);
@@ -2076,7 +2076,7 @@
SetRequest("POST", "/", DEFAULT_PRIORITY);
size_t spdy_request_headers_frame_length;
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
AddWrite(ConstructInitialSettingsPacket());
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_FORWARD_SECURE);
AddWrite(ConstructRequestHeadersPacketInner(
@@ -2110,7 +2110,7 @@
SetRequest("POST", "/", DEFAULT_PRIORITY);
size_t spdy_request_headers_frame_length;
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
AddWrite(ConstructInitialSettingsPacket());
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_FORWARD_SECURE);
AddWrite(ConstructRequestHeadersPacketInner(
@@ -2168,7 +2168,7 @@
SetRequest("POST", "/", DEFAULT_PRIORITY);
size_t spdy_request_headers_frame_length;
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
AddWrite(ConstructInitialSettingsPacket());
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_FORWARD_SECURE);
AddWrite(ConstructRequestHeadersPacketInner(
@@ -2218,7 +2218,7 @@
SetRequest("POST", "/", DEFAULT_PRIORITY);
size_t spdy_request_headers_frame_length;
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
AddWrite(ConstructInitialSettingsPacket());
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_FORWARD_SECURE);
AddWrite(ConstructRequestHeadersPacketInner(
@@ -2280,7 +2280,7 @@
SetRequest("POST", "/", DEFAULT_PRIORITY);
size_t spdy_request_headers_frame_length;
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
AddWrite(ConstructInitialSettingsPacket());
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_FORWARD_SECURE);
AddWrite(ConstructRequestHeadersPacketInner(
@@ -2358,7 +2358,7 @@
SetRequest("GET", "/", DEFAULT_PRIORITY);
size_t spdy_request_headers_frame_length;
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
AddWrite(ConstructInitialSettingsPacket());
AddWrite(ConstructRequestHeadersPacket(kFin, DEFAULT_PRIORITY,
&spdy_request_headers_frame_length));
@@ -2413,7 +2413,7 @@
size_t spdy_trailers_frame_length;
spdy::SpdyHeaderBlock trailers;
trailers["foo"] = "bar";
- if (!quic::VersionUsesQpack(version_.transport_version)) {
+ if (!quic::VersionUsesHttp3(version_.transport_version)) {
trailers[quic::kFinalOffsetHeaderKey] =
base::NumberToString(strlen(kResponseBody));
}
diff --git a/net/quic/crypto/proof_test_chromium.cc b/net/quic/crypto/proof_test_chromium.cc
index 3eb5f3f..b6a3919 100644
--- a/net/quic/crypto/proof_test_chromium.cc
+++ b/net/quic/crypto/proof_test_chromium.cc
@@ -237,7 +237,7 @@
string sig;
bool success;
std::unique_ptr<TestingSignatureCallback> callback =
- quic::QuicMakeUnique<TestingSignatureCallback>(&success, &sig);
+ std::make_unique<TestingSignatureCallback>(&success, &sig);
source->ComputeTlsSignature(server_address, hostname, SSL_SIGN_RSA_PSS_SHA256,
to_be_signed, std::move(callback));
EXPECT_TRUE(success);
diff --git a/net/quic/mock_crypto_client_stream.cc b/net/quic/mock_crypto_client_stream.cc
index 5851566..3de9f46 100644
--- a/net/quic/mock_crypto_client_stream.cc
+++ b/net/quic/mock_crypto_client_stream.cc
@@ -32,6 +32,7 @@
using quic::PACKET_8BYTE_CONNECTION_ID;
using quic::Perspective;
using quic::ProofVerifyContext;
+using quic::PROTOCOL_TLS1_3;
using quic::QUIC_CRYPTO_MESSAGE_AFTER_HANDSHAKE_COMPLETE;
using quic::QUIC_NO_ERROR;
using quic::QUIC_PROOF_INVALID;
@@ -39,13 +40,13 @@
using quic::QuicCryptoClientConfig;
using quic::QuicCryptoNegotiatedParameters;
using quic::QuicErrorCode;
-using quic::QuicMakeUnique;
using quic::QuicServerId;
using quic::QuicSession;
using quic::QuicSpdyClientSessionBase;
using quic::QuicStringPiece;
using quic::QuicTagVector;
using quic::QuicTime;
+using quic::TransportParameters;
using std::string;
namespace net {
@@ -111,28 +112,28 @@
if (session()->connection()->version().KnowsWhichDecrypterToUse()) {
session()->connection()->InstallDecrypter(
ENCRYPTION_ZERO_RTT,
- QuicMakeUnique<MockDecrypter>(Perspective::IS_CLIENT));
+ std::make_unique<MockDecrypter>(Perspective::IS_CLIENT));
} else {
session()->connection()->SetDecrypter(
ENCRYPTION_ZERO_RTT,
- QuicMakeUnique<MockDecrypter>(Perspective::IS_CLIENT));
+ std::make_unique<MockDecrypter>(Perspective::IS_CLIENT));
}
session()->connection()->SetEncrypter(
ENCRYPTION_ZERO_RTT,
- QuicMakeUnique<MockEncrypter>(Perspective::IS_CLIENT));
+ std::make_unique<MockEncrypter>(Perspective::IS_CLIENT));
} else {
if (session()->connection()->version().KnowsWhichDecrypterToUse()) {
session()->connection()->InstallDecrypter(
ENCRYPTION_ZERO_RTT,
- QuicMakeUnique<NullDecrypter>(Perspective::IS_CLIENT));
+ std::make_unique<NullDecrypter>(Perspective::IS_CLIENT));
} else {
session()->connection()->SetDecrypter(
ENCRYPTION_ZERO_RTT,
- QuicMakeUnique<NullDecrypter>(Perspective::IS_CLIENT));
+ std::make_unique<NullDecrypter>(Perspective::IS_CLIENT));
}
session()->connection()->SetEncrypter(
ENCRYPTION_ZERO_RTT,
- QuicMakeUnique<NullEncrypter>(Perspective::IS_CLIENT));
+ std::make_unique<NullEncrypter>(Perspective::IS_CLIENT));
}
session()->connection()->SetDefaultEncryptionLevel(ENCRYPTION_ZERO_RTT);
session()->OnCryptoHandshakeEvent(QuicSession::ENCRYPTION_ESTABLISHED);
@@ -153,29 +154,29 @@
if (session()->connection()->version().KnowsWhichDecrypterToUse()) {
session()->connection()->InstallDecrypter(
ENCRYPTION_FORWARD_SECURE,
- QuicMakeUnique<MockDecrypter>(Perspective::IS_CLIENT));
+ std::make_unique<MockDecrypter>(Perspective::IS_CLIENT));
} else {
session()->connection()->SetDecrypter(
ENCRYPTION_FORWARD_SECURE,
- QuicMakeUnique<MockDecrypter>(Perspective::IS_CLIENT));
+ std::make_unique<MockDecrypter>(Perspective::IS_CLIENT));
}
session()->connection()->SetEncrypter(
ENCRYPTION_FORWARD_SECURE,
- QuicMakeUnique<MockEncrypter>(Perspective::IS_CLIENT));
+ std::make_unique<MockEncrypter>(Perspective::IS_CLIENT));
} else {
if (session()->connection()->version().KnowsWhichDecrypterToUse()) {
session()->connection()->InstallDecrypter(
ENCRYPTION_FORWARD_SECURE,
- QuicMakeUnique<NullDecrypter>(Perspective::IS_CLIENT));
+ std::make_unique<NullDecrypter>(Perspective::IS_CLIENT));
} else {
session()->connection()->SetDecrypter(
ENCRYPTION_FORWARD_SECURE,
- QuicMakeUnique<NullDecrypter>(Perspective::IS_CLIENT));
+ std::make_unique<NullDecrypter>(Perspective::IS_CLIENT));
}
session()->connection()->SetEncrypter(ENCRYPTION_INITIAL, nullptr);
session()->connection()->SetEncrypter(
ENCRYPTION_FORWARD_SECURE,
- QuicMakeUnique<NullEncrypter>(Perspective::IS_CLIENT));
+ std::make_unique<NullEncrypter>(Perspective::IS_CLIENT));
}
session()->connection()->SetDefaultEncryptionLevel(
ENCRYPTION_FORWARD_SECURE);
@@ -228,29 +229,29 @@
if (session()->connection()->version().KnowsWhichDecrypterToUse()) {
session()->connection()->InstallDecrypter(
ENCRYPTION_FORWARD_SECURE,
- QuicMakeUnique<MockDecrypter>(Perspective::IS_CLIENT));
+ std::make_unique<MockDecrypter>(Perspective::IS_CLIENT));
} else {
session()->connection()->SetDecrypter(
ENCRYPTION_FORWARD_SECURE,
- QuicMakeUnique<MockDecrypter>(Perspective::IS_CLIENT));
+ std::make_unique<MockDecrypter>(Perspective::IS_CLIENT));
}
session()->connection()->SetEncrypter(
ENCRYPTION_FORWARD_SECURE,
- QuicMakeUnique<MockEncrypter>(Perspective::IS_CLIENT));
+ std::make_unique<MockEncrypter>(Perspective::IS_CLIENT));
} else {
if (session()->connection()->version().KnowsWhichDecrypterToUse()) {
session()->connection()->InstallDecrypter(
ENCRYPTION_FORWARD_SECURE,
- QuicMakeUnique<NullDecrypter>(Perspective::IS_CLIENT));
+ std::make_unique<NullDecrypter>(Perspective::IS_CLIENT));
} else {
session()->connection()->SetDecrypter(
ENCRYPTION_FORWARD_SECURE,
- QuicMakeUnique<NullDecrypter>(Perspective::IS_CLIENT));
+ std::make_unique<NullDecrypter>(Perspective::IS_CLIENT));
}
session()->connection()->SetEncrypter(ENCRYPTION_INITIAL, nullptr);
session()->connection()->SetEncrypter(
ENCRYPTION_FORWARD_SECURE,
- QuicMakeUnique<NullEncrypter>(Perspective::IS_CLIENT));
+ std::make_unique<NullEncrypter>(Perspective::IS_CLIENT));
}
session()->connection()->SetDefaultEncryptionLevel(
ENCRYPTION_FORWARD_SECURE);
@@ -282,13 +283,27 @@
kDefaultMaxStreamsPerConnection / 2);
config.SetMaxIncomingUnidirectionalStreamsToSend(
kDefaultMaxStreamsPerConnection / 2);
+ config.SetInitialMaxStreamDataBytesIncomingBidirectionalToSend(
+ quic::kMinimumFlowControlSendWindow);
+ config.SetInitialMaxStreamDataBytesOutgoingBidirectionalToSend(
+ quic::kMinimumFlowControlSendWindow);
+ config.SetInitialMaxStreamDataBytesUnidirectionalToSend(
+ quic::kMinimumFlowControlSendWindow);
- CryptoHandshakeMessage msg;
- config.ToHandshakeMessage(
- &msg, session()->connection()->version().transport_version);
+ QuicErrorCode error;
std::string error_details;
- const QuicErrorCode error =
- session()->config()->ProcessPeerHello(msg, CLIENT, &error_details);
+ if (session()->connection()->version().handshake_protocol ==
+ PROTOCOL_TLS1_3) {
+ TransportParameters params;
+ ASSERT_TRUE(config.FillTransportParameters(¶ms));
+ error = session()->config()->ProcessTransportParameters(params, CLIENT,
+ &error_details);
+ } else {
+ CryptoHandshakeMessage msg;
+ config.ToHandshakeMessage(
+ &msg, session()->connection()->version().transport_version);
+ error = session()->config()->ProcessPeerHello(msg, CLIENT, &error_details);
+ }
ASSERT_EQ(QUIC_NO_ERROR, error);
ASSERT_TRUE(session()->config()->negotiated());
session()->OnConfigNegotiated();
diff --git a/net/quic/platform/impl/quic_default_proof_providers_impl.cc b/net/quic/platform/impl/quic_default_proof_providers_impl.cc
index 23d6833..c84146d8 100644
--- a/net/quic/platform/impl/quic_default_proof_providers_impl.cc
+++ b/net/quic/platform/impl/quic_default_proof_providers_impl.cc
@@ -76,7 +76,7 @@
const std::string& host) {
std::unique_ptr<net::CertVerifier> cert_verifier =
net::CertVerifier::CreateDefault(/*cert_net_fetcher=*/nullptr);
- return QuicMakeUnique<ProofVerifierChromiumWithOwnership>(
+ return std::make_unique<ProofVerifierChromiumWithOwnership>(
std::move(cert_verifier), host);
}
diff --git a/net/quic/quic_chromium_client_session.cc b/net/quic/quic_chromium_client_session.cc
index acac95a..4a8dec6 100644
--- a/net/quic/quic_chromium_client_session.cc
+++ b/net/quic/quic_chromium_client_session.cc
@@ -766,7 +766,7 @@
connection_description,
std::move(socket_performance_watcher),
net_log_)),
- http3_logger_(VersionHasStreamType(connection->transport_version())
+ http3_logger_(VersionUsesHttp3(connection->transport_version())
? new QuicHttp3Logger(net_log_)
: nullptr),
going_away_(false),
@@ -803,7 +803,7 @@
std::make_unique<ProofVerifyContextChromium>(cert_verify_flags,
net_log_),
crypto_config_->GetConfig()));
- if (VersionHasStreamType(transport_version()))
+ if (VersionUsesHttp3(transport_version()))
set_debug_visitor(http3_logger_.get());
connection->set_debug_visitor(logger_.get());
connection->set_creator_debug_delegate(logger_.get());
@@ -982,11 +982,11 @@
quic::QuicStreamId id,
const spdy::SpdyStreamPrecedence& new_precedence) {
if (headers_include_h2_stream_dependency_ ||
- VersionHasStreamType(connection()->transport_version())) {
+ VersionUsesHttp3(connection()->transport_version())) {
auto updates = priority_dependency_state_.OnStreamUpdate(
id, new_precedence.spdy3_priority());
for (auto update : updates) {
- if (!VersionHasStreamType(connection()->transport_version())) {
+ if (!VersionUsesHttp3(connection()->transport_version())) {
WritePriority(update.id, update.parent_stream_id, update.weight,
update.exclusive);
} else if (FLAGS_quic_allow_http3_priority) {
@@ -3110,7 +3110,7 @@
net_log_);
}
if (headers_include_h2_stream_dependency_ ||
- VersionHasStreamType(connection()->transport_version())) {
+ VersionUsesHttp3(connection()->transport_version())) {
// Even though the promised stream will not be created until after the
// push promise headers are received, send a PRIORITY frame for the
// promised stream ID. Send |kDefaultPriority| since that will be the
@@ -3121,7 +3121,7 @@
bool exclusive = false;
priority_dependency_state_.OnStreamCreation(
promised_id, priority, &parent_stream_id, &weight, &exclusive);
- if (!VersionHasStreamType(connection()->transport_version())) {
+ if (!VersionUsesHttp3(connection()->transport_version())) {
WritePriority(promised_id, parent_stream_id, weight, exclusive);
} else if (FLAGS_quic_allow_http3_priority) {
quic::PriorityFrame frame;
diff --git a/net/quic/quic_chromium_client_session_test.cc b/net/quic/quic_chromium_client_session_test.cc
index d7d6c5b..3a576e4 100644
--- a/net/quic/quic_chromium_client_session_test.cc
+++ b/net/quic/quic_chromium_client_session_test.cc
@@ -291,7 +291,7 @@
TEST_P(QuicChromiumClientSessionTest, IsFatalErrorNotSetForNonFatalError) {
MockQuicData quic_data(version_);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
quic_data.AddWrite(SYNCHRONOUS, client_maker_.MakeInitialSettingsPacket(1));
quic_data.AddRead(ASYNC, ERR_IO_PENDING);
quic_data.AddRead(ASYNC, OK); // EOF
@@ -315,7 +315,7 @@
TEST_P(QuicChromiumClientSessionTest, IsFatalErrorSetForFatalError) {
MockQuicData quic_data(version_);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
quic_data.AddWrite(SYNCHRONOUS, client_maker_.MakeInitialSettingsPacket(1));
quic_data.AddRead(ASYNC, ERR_IO_PENDING);
quic_data.AddRead(ASYNC, OK); // EOF
@@ -337,7 +337,7 @@
TEST_P(QuicChromiumClientSessionTest, CryptoConnect) {
MockQuicData quic_data(version_);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
quic_data.AddWrite(SYNCHRONOUS, client_maker_.MakeInitialSettingsPacket(1));
quic_data.AddRead(ASYNC, ERR_IO_PENDING);
quic_data.AddRead(ASYNC, OK); // EOF
@@ -348,7 +348,7 @@
TEST_P(QuicChromiumClientSessionTest, Handle) {
MockQuicData quic_data(version_);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
quic_data.AddWrite(SYNCHRONOUS, client_maker_.MakeInitialSettingsPacket(1));
quic_data.AddRead(ASYNC, ERR_IO_PENDING);
quic_data.AddRead(ASYNC, OK); // EOF
@@ -431,7 +431,7 @@
TEST_P(QuicChromiumClientSessionTest, StreamRequest) {
MockQuicData quic_data(version_);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
quic_data.AddWrite(SYNCHRONOUS, client_maker_.MakeInitialSettingsPacket(1));
quic_data.AddRead(ASYNC, ERR_IO_PENDING);
quic_data.AddRead(ASYNC, OK); // EOF
@@ -456,7 +456,7 @@
TEST_P(QuicChromiumClientSessionTest, ConfirmationRequiredStreamRequest) {
MockQuicData quic_data(version_);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
quic_data.AddWrite(SYNCHRONOUS, client_maker_.MakeInitialSettingsPacket(1));
quic_data.AddRead(ASYNC, ERR_IO_PENDING);
quic_data.AddRead(ASYNC, OK); // EOF
@@ -481,7 +481,7 @@
TEST_P(QuicChromiumClientSessionTest, StreamRequestBeforeConfirmation) {
MockQuicData quic_data(version_);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
quic_data.AddWrite(SYNCHRONOUS, client_maker_.MakeInitialSettingsPacket(1));
quic_data.AddRead(ASYNC, ERR_IO_PENDING);
quic_data.AddRead(ASYNC, OK); // EOF
@@ -512,7 +512,7 @@
TEST_P(QuicChromiumClientSessionTest, CancelStreamRequestBeforeRelease) {
MockQuicData quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
quic_data.AddWrite(SYNCHRONOUS,
client_maker_.MakeInitialSettingsPacket(packet_num++));
}
@@ -755,7 +755,7 @@
TEST_P(QuicChromiumClientSessionTest, ConnectionCloseBeforeStreamRequest) {
MockQuicData quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
quic_data.AddWrite(SYNCHRONOUS,
client_maker_.MakeInitialSettingsPacket(packet_num++));
}
@@ -956,7 +956,7 @@
base::HistogramTester histogram_tester;
MockQuicData quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
quic_data.AddWrite(ASYNC,
client_maker_.MakeInitialSettingsPacket(packet_num++));
}
@@ -1010,7 +1010,7 @@
base::HistogramTester histogram_tester;
MockQuicData quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
quic_data.AddWrite(ASYNC,
client_maker_.MakeInitialSettingsPacket(packet_num++));
}
@@ -1067,12 +1067,12 @@
// Regression test for crbug.com/968621.
TEST_P(QuicChromiumClientSessionTest, PendingStreamOnRst) {
- if (!quic::VersionHasStreamType(version_.transport_version))
+ if (!quic::VersionUsesHttp3(version_.transport_version))
return;
MockQuicData quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
quic_data.AddWrite(ASYNC,
client_maker_.MakeInitialSettingsPacket(packet_num++));
}
@@ -1099,12 +1099,12 @@
// Regression test for crbug.com/971361.
TEST_P(QuicChromiumClientSessionTest, ClosePendingStream) {
- if (!quic::VersionHasStreamType(version_.transport_version))
+ if (!quic::VersionUsesHttp3(version_.transport_version))
return;
MockQuicData quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
quic_data.AddWrite(ASYNC,
client_maker_.MakeInitialSettingsPacket(packet_num++));
}
@@ -1129,7 +1129,7 @@
TEST_P(QuicChromiumClientSessionTest, CancelPushWhenPendingValidation) {
MockQuicData quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
quic_data.AddWrite(ASYNC,
client_maker_.MakeInitialSettingsPacket(packet_num++));
}
@@ -1187,7 +1187,7 @@
base::HistogramTester histogram_tester;
MockQuicData quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
quic_data.AddWrite(ASYNC,
client_maker_.MakeInitialSettingsPacket(packet_num++));
}
@@ -1241,7 +1241,7 @@
base::HistogramTester histogram_tester;
MockQuicData quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
quic_data.AddWrite(ASYNC,
client_maker_.MakeInitialSettingsPacket(packet_num++));
}
@@ -1357,7 +1357,7 @@
TEST_P(QuicChromiumClientSessionTest, GoAwayReceived) {
MockQuicData quic_data(version_);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
quic_data.AddWrite(SYNCHRONOUS, client_maker_.MakeInitialSettingsPacket(1));
quic_data.AddRead(ASYNC, ERR_IO_PENDING);
quic_data.AddRead(ASYNC, OK); // EOF
@@ -1376,7 +1376,7 @@
TEST_P(QuicChromiumClientSessionTest, CanPool) {
MockQuicData quic_data(version_);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
quic_data.AddWrite(SYNCHRONOUS, client_maker_.MakeInitialSettingsPacket(1));
quic_data.AddRead(ASYNC, ERR_IO_PENDING);
quic_data.AddRead(ASYNC, OK); // EOF
@@ -1451,7 +1451,7 @@
SocketTag(), kNetworkIsolationKey1);
MockQuicData quic_data(version_);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
quic_data.AddWrite(SYNCHRONOUS, client_maker_.MakeInitialSettingsPacket(1));
quic_data.AddRead(ASYNC, ERR_IO_PENDING);
quic_data.AddRead(ASYNC, OK); // EOF
@@ -1509,7 +1509,7 @@
const char kNoPinsHost[] = "no-pkp.example.org";
MockQuicData quic_data(version_);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
quic_data.AddWrite(SYNCHRONOUS, client_maker_.MakeInitialSettingsPacket(1));
quic_data.AddRead(ASYNC, ERR_IO_PENDING);
quic_data.AddRead(ASYNC, OK); // EOF
@@ -1540,7 +1540,7 @@
ScopedTransportSecurityStateSource scoped_security_state_source;
MockQuicData quic_data(version_);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
quic_data.AddWrite(SYNCHRONOUS, client_maker_.MakeInitialSettingsPacket(1));
quic_data.AddRead(ASYNC, ERR_IO_PENDING);
quic_data.AddRead(ASYNC, OK); // EOF
@@ -1572,7 +1572,7 @@
MockQuicData quic_data(version_);
int packet_num = 1;
socket_data_.reset();
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
quic_data.AddWrite(SYNCHRONOUS,
client_maker_.MakeInitialSettingsPacket(packet_num++));
}
@@ -1585,7 +1585,7 @@
char data[] = "ABCD";
std::unique_ptr<quic::QuicEncryptedPacket> client_ping;
std::unique_ptr<quic::QuicEncryptedPacket> ack_and_data_out;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
client_ping =
client_maker_.MakeAckAndPingPacket(packet_num++, false, 1, 1, 1);
} else {
@@ -1646,7 +1646,7 @@
MockQuicData quic_data(version_);
socket_data_.reset();
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
quic_data.AddWrite(SYNCHRONOUS,
client_maker_.MakeInitialSettingsPacket(packet_num++));
}
@@ -1707,7 +1707,7 @@
std::unique_ptr<quic::QuicEncryptedPacket> initial_ping;
std::vector<MockWrite> old_writes;
std::vector<MockRead> old_reads;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
settings_packet = client_maker_.MakeInitialSettingsPacket(1);
old_writes.push_back(MockWrite(ASYNC, settings_packet->data(),
settings_packet->length(), 0));
@@ -1728,7 +1728,7 @@
Initialize();
CompleteCryptoHandshake();
- if (!VersionUsesQpack(version_.transport_version))
+ if (!VersionUsesHttp3(version_.transport_version))
session_->SendPing();
MockWrite writes[] = {
MockWrite(SYNCHRONOUS, client_ping->data(), client_ping->length(), 1)};
@@ -1852,7 +1852,7 @@
MockQuicData quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
quic_data.AddWrite(SYNCHRONOUS,
client_maker_.MakeInitialSettingsPacket(packet_num++));
}
diff --git a/net/quic/quic_chromium_client_stream.cc b/net/quic/quic_chromium_client_stream.cc
index 5b2dbae..ed8709e 100644
--- a/net/quic/quic_chromium_client_stream.cc
+++ b/net/quic/quic_chromium_client_stream.cc
@@ -709,7 +709,7 @@
}
bool QuicChromiumClientStream::IsFirstStream() {
- if (VersionUsesQpack(quic_version_)) {
+ if (VersionUsesHttp3(quic_version_)) {
return id() == quic::QuicUtils::GetFirstBidirectionalStreamId(
quic_version_, quic::Perspective::IS_CLIENT);
}
diff --git a/net/quic/quic_flags_list.h b/net/quic/quic_flags_list.h
index f8be3e9..af73f745 100644
--- a/net/quic/quic_flags_list.h
+++ b/net/quic/quic_flags_list.h
@@ -402,3 +402,6 @@
// If true, support HTTP/3 priority in v99.
QUIC_FLAG(bool, FLAGS_quic_allow_http3_priority, false)
+
+// If true, enable QUIC version 50.
+QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_enable_version_50, false)
diff --git a/net/quic/quic_http_stream.cc b/net/quic/quic_http_stream.cc
index 6cd7318..af8df9d0 100644
--- a/net/quic/quic_http_stream.cc
+++ b/net/quic/quic_http_stream.cc
@@ -101,6 +101,8 @@
return HttpResponseInfo::CONNECTION_INFO_QUIC_48;
case quic::QUIC_VERSION_49:
return HttpResponseInfo::CONNECTION_INFO_QUIC_49;
+ case quic::QUIC_VERSION_50:
+ return HttpResponseInfo::CONNECTION_INFO_QUIC_50;
case quic::QUIC_VERSION_99:
return HttpResponseInfo::CONNECTION_INFO_QUIC_99;
case quic::QUIC_VERSION_RESERVED_FOR_NEGOTIATION:
@@ -350,7 +352,7 @@
// When QPACK is enabled, headers are sent and received on the stream, so
// the headers bytes do not need to be accounted for independently.
int64_t total_received_bytes =
- quic::VersionUsesQpack(quic_session()->GetQuicVersion())
+ quic::VersionUsesHttp3(quic_session()->GetQuicVersion())
? 0
: headers_bytes_received_;
if (stream_) {
@@ -367,7 +369,7 @@
// When QPACK is enabled, headers are sent and received on the stream, so
// the headers bytes do not need to be accounted for independently.
int64_t total_sent_bytes =
- quic::VersionUsesQpack(quic_session()->GetQuicVersion())
+ quic::VersionUsesHttp3(quic_session()->GetQuicVersion())
? 0
: headers_bytes_sent_;
if (stream_) {
diff --git a/net/quic/quic_http_stream_test.cc b/net/quic/quic_http_stream_test.cc
index 92aeb21..74e87cf 100644
--- a/net/quic/quic_http_stream_test.cc
+++ b/net/quic/quic_http_stream_test.cc
@@ -308,7 +308,7 @@
send_algorithm_ = new quic::test::MockSendAlgorithm();
EXPECT_CALL(*send_algorithm_, InRecovery()).WillRepeatedly(Return(false));
EXPECT_CALL(*send_algorithm_, InSlowStart()).WillRepeatedly(Return(false));
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
EXPECT_CALL(*send_algorithm_, OnPacketSent(_, _, _, _, _))
.Times(testing::AtLeast(1));
}
@@ -773,7 +773,7 @@
SetRequest("GET", "/", DEFAULT_PRIORITY);
size_t spdy_request_header_frame_length;
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
AddWrite(ConstructInitialSettingsPacket(packet_number++));
AddWrite(InnerConstructRequestHeadersPacket(
packet_number++, GetNthClientInitiatedBidirectionalStreamId(0),
@@ -837,7 +837,7 @@
size_t spdy_request_header_frame_length;
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
AddWrite(ConstructInitialSettingsPacket(packet_number++));
AddWrite(InnerConstructRequestHeadersPacket(
packet_number++, GetNthClientInitiatedBidirectionalStreamId(0),
@@ -928,7 +928,7 @@
SetRequest("GET", "/", DEFAULT_PRIORITY);
size_t spdy_request_header_frame_length;
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
AddWrite(ConstructInitialSettingsPacket(packet_number++));
AddWrite(InnerConstructRequestHeadersPacket(
packet_number++, GetNthClientInitiatedBidirectionalStreamId(0),
@@ -976,7 +976,7 @@
spdy::SpdyHeaderBlock trailers;
size_t spdy_trailers_frame_length;
trailers["foo"] = "bar";
- if (!quic::VersionUsesQpack(version_.transport_version)) {
+ if (!quic::VersionUsesHttp3(version_.transport_version)) {
trailers[quic::kFinalOffsetHeaderKey] =
base::NumberToString(strlen(kResponseBody) + header.length());
}
@@ -1027,7 +1027,7 @@
SetRequest("GET", "/", DEFAULT_PRIORITY);
size_t spdy_request_headers_frame_length;
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
AddWrite(ConstructInitialSettingsPacket(packet_number++));
AddWrite(InnerConstructRequestHeadersPacket(
packet_number++, GetNthClientInitiatedBidirectionalStreamId(0),
@@ -1156,7 +1156,7 @@
SetRequest("GET", "/", DEFAULT_PRIORITY);
size_t spdy_request_headers_frame_length;
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
AddWrite(ConstructInitialSettingsPacket(packet_number++));
AddWrite(InnerConstructRequestHeadersPacket(
packet_number++, GetNthClientInitiatedBidirectionalStreamId(0),
@@ -1209,7 +1209,7 @@
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
AddWrite(ConstructInitialSettingsPacket(packet_number++));
AddWrite(InnerConstructRequestHeadersPacket(
packet_number++, GetNthClientInitiatedBidirectionalStreamId(0),
@@ -1246,7 +1246,7 @@
SetRequest("GET", "/", DEFAULT_PRIORITY);
size_t spdy_request_headers_frame_length;
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
AddWrite(ConstructInitialSettingsPacket(packet_number++));
AddWrite(InnerConstructRequestHeadersPacket(
packet_number++, GetNthClientInitiatedBidirectionalStreamId(0),
@@ -1280,7 +1280,7 @@
SetRequest("POST", "/", DEFAULT_PRIORITY);
size_t spdy_request_headers_frame_length;
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
AddWrite(ConstructInitialSettingsPacket(packet_number++));
std::string header = ConstructDataHeader(strlen(kUploadData));
@@ -1363,7 +1363,7 @@
SetRequest("POST", "/", DEFAULT_PRIORITY);
size_t spdy_request_headers_frame_length;
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
AddWrite(ConstructInitialSettingsPacket(packet_number++));
std::string header = ConstructDataHeader(strlen(kUploadData));
if (version_.transport_version != quic::QUIC_VERSION_99) {
@@ -1447,7 +1447,7 @@
size_t chunk_size = strlen(kUploadData);
size_t spdy_request_headers_frame_length;
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
AddWrite(ConstructInitialSettingsPacket(packet_number++));
std::string header = ConstructDataHeader(chunk_size);
if (version_.transport_version == quic::QUIC_VERSION_99) {
@@ -1533,7 +1533,7 @@
size_t chunk_size = strlen(kUploadData);
size_t spdy_request_headers_frame_length;
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
AddWrite(ConstructInitialSettingsPacket(packet_number++));
std::string header = ConstructDataHeader(chunk_size);
@@ -1614,7 +1614,7 @@
SetRequest("POST", "/", DEFAULT_PRIORITY);
size_t spdy_request_headers_frame_length;
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
AddWrite(ConstructInitialSettingsPacket(packet_number++));
AddWrite(InnerConstructRequestHeadersPacket(
packet_number++, GetNthClientInitiatedBidirectionalStreamId(0),
@@ -1685,7 +1685,7 @@
SetRequest("GET", "/", DEFAULT_PRIORITY);
size_t spdy_request_headers_frame_length;
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
AddWrite(ConstructInitialSettingsPacket(packet_number++));
AddWrite(InnerConstructRequestHeadersPacket(
packet_number++, GetNthClientInitiatedBidirectionalStreamId(0),
@@ -1733,7 +1733,7 @@
SetRequest("GET", "/", MEDIUM);
size_t spdy_request_headers_frame_length;
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
AddWrite(ConstructInitialSettingsPacket(packet_number++));
AddWrite(InnerConstructRequestHeadersPacket(
packet_number++, GetNthClientInitiatedBidirectionalStreamId(0),
@@ -1776,7 +1776,7 @@
SetRequest("POST", "/", DEFAULT_PRIORITY);
size_t spdy_request_headers_frame_length;
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
AddWrite(ConstructInitialSettingsPacket(packet_number++));
std::string header = ConstructDataHeader(strlen(kUploadData));
if (version_.transport_version != quic::QUIC_VERSION_99) {
@@ -1828,7 +1828,7 @@
TEST_P(QuicHttpStreamTest, SessionClosedBeforeSendHeadersComplete) {
SetRequest("POST", "/", DEFAULT_PRIORITY);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
AddWrite(ConstructInitialSettingsPacket());
AddWrite(SYNCHRONOUS, ERR_FAILED);
Initialize();
@@ -1860,7 +1860,7 @@
TEST_P(QuicHttpStreamTest, SessionClosedBeforeSendHeadersCompleteReadResponse) {
SetRequest("POST", "/", DEFAULT_PRIORITY);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
AddWrite(ConstructInitialSettingsPacket());
AddWrite(SYNCHRONOUS, ERR_FAILED);
Initialize();
@@ -1897,7 +1897,7 @@
SetRequest("POST", "/", DEFAULT_PRIORITY);
size_t spdy_request_headers_frame_length;
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
AddWrite(ConstructInitialSettingsPacket(packet_number++));
AddWrite(InnerConstructRequestHeadersPacket(
packet_number++, GetNthClientInitiatedBidirectionalStreamId(0),
@@ -1939,7 +1939,7 @@
SetRequest("POST", "/", DEFAULT_PRIORITY);
size_t spdy_request_headers_frame_length;
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
AddWrite(ConstructInitialSettingsPacket(packet_number++));
std::string header = ConstructDataHeader(strlen(kUploadData));
if (version_.transport_version != quic::QUIC_VERSION_99) {
@@ -2460,7 +2460,7 @@
SetRequest("POST", "/", DEFAULT_PRIORITY);
size_t spdy_request_headers_frame_length;
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
AddWrite(ConstructInitialSettingsPacket(packet_number++));
AddWrite(ConstructRequestAndRstPacket(
packet_number++, GetNthClientInitiatedBidirectionalStreamId(0),
@@ -2496,7 +2496,7 @@
SetRequest("POST", "/", DEFAULT_PRIORITY);
size_t spdy_request_headers_frame_length;
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
AddWrite(ConstructInitialSettingsPacket(packet_number++));
AddWrite(InnerConstructRequestHeadersPacket(
packet_number++, GetNthClientInitiatedBidirectionalStreamId(0),
diff --git a/net/quic/quic_network_transaction_unittest.cc b/net/quic/quic_network_transaction_unittest.cc
index a49b3071..ffda8beb 100644
--- a/net/quic/quic_network_transaction_unittest.cc
+++ b/net/quic/quic_network_transaction_unittest.cc
@@ -971,7 +971,7 @@
MockQuicData quic_data(version_);
int packet_number = 1;
client_maker.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
quic_data.AddWrite(
SYNCHRONOUS, client_maker.MakeInitialSettingsPacket(packet_number++));
}
@@ -1088,7 +1088,7 @@
MockCryptoClientStream::CONFIRM_HANDSHAKE);
MockQuicData mock_quic_data(version_);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
mock_quic_data.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket(1));
mock_quic_data.AddWrite(SYNCHRONOUS, ERR_INTERNET_DISCONNECTED);
mock_quic_data.AddRead(ASYNC, ERR_IO_PENDING); // Pause
@@ -1119,7 +1119,7 @@
MockCryptoClientStream::CONFIRM_HANDSHAKE);
MockQuicData mock_quic_data(version_);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
mock_quic_data.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket(1));
mock_quic_data.AddWrite(ASYNC, ERR_INTERNET_DISCONNECTED);
mock_quic_data.AddRead(ASYNC, ERR_IO_PENDING); // Pause
@@ -1147,7 +1147,7 @@
MockQuicData mock_quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -1187,7 +1187,7 @@
MockQuicData mock_quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -1227,7 +1227,7 @@
MockQuicData mock_quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -1287,7 +1287,7 @@
EXPECT_LT(0, pos);
int log_stream_id = GetIntegerValueFromParams(entries[pos], "stream_id");
- if (quic::VersionUsesQpack(version_.transport_version)) {
+ if (quic::VersionUsesHttp3(version_.transport_version)) {
EXPECT_EQ(GetNthClientInitiatedBidirectionalStreamId(0),
static_cast<quic::QuicStreamId>(log_stream_id));
} else {
@@ -1302,7 +1302,7 @@
MockQuicData mock_quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -1322,7 +1322,7 @@
response_headers["key8"] = std::string(30000, 'A');
quic::QuicStreamId stream_id;
std::string response_data;
- if (quic::VersionUsesQpack(version_.transport_version)) {
+ if (quic::VersionUsesHttp3(version_.transport_version)) {
stream_id = GetNthClientInitiatedBidirectionalStreamId(0);
std::vector<std::string> encoded = server_maker_.QpackEncodeHeaders(
stream_id, std::move(response_headers), nullptr);
@@ -1378,7 +1378,7 @@
MockQuicData mock_quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -1401,7 +1401,7 @@
quic::QuicStreamId stream_id;
std::string response_data;
- if (quic::VersionUsesQpack(version_.transport_version)) {
+ if (quic::VersionUsesHttp3(version_.transport_version)) {
stream_id = GetNthClientInitiatedBidirectionalStreamId(0);
std::vector<std::string> encoded = server_maker_.QpackEncodeHeaders(
stream_id, std::move(response_headers), nullptr);
@@ -1462,7 +1462,7 @@
MockQuicData mock_quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -1500,7 +1500,7 @@
MockQuicData mock_quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -1552,7 +1552,7 @@
client_maker_.set_hostname(origin_host);
MockQuicData mock_quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -1617,7 +1617,7 @@
MockQuicData mock_quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -1715,7 +1715,7 @@
// by the client has been advertised by the server.
MockQuicData mock_quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -1792,7 +1792,7 @@
// dispensing the socket, making it available for the second try.
MockQuicData mock_quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -1853,12 +1853,12 @@
HostPortPair::FromString("mail.example.org:443"));
MockQuicData mock_quic_data1(version_);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
mock_quic_data1.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket(1));
mock_quic_data1.AddRead(ASYNC, ERR_SOCKET_NOT_CONNECTED);
client_maker_.Reset();
MockQuicData mock_quic_data2(version_);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
mock_quic_data2.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket(1));
crypto_client_stream_factory_.AddProofVerifyDetails(&verify_details_);
mock_quic_data2.AddRead(ASYNC, ERR_SOCKET_NOT_CONNECTED);
@@ -1919,7 +1919,7 @@
MockQuicData mock_quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -1967,7 +1967,7 @@
MockQuicData mock_quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -2045,7 +2045,7 @@
// alternative service infrmation has been received in this context before.
MockQuicData mock_quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -2127,7 +2127,7 @@
MockQuicData mock_quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -2193,7 +2193,7 @@
MockQuicData mock_quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -2241,7 +2241,7 @@
MockQuicData mock_quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -2377,7 +2377,7 @@
MockQuicData mock_quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -2445,7 +2445,7 @@
MockQuicData mock_quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -2484,7 +2484,7 @@
}
MockQuicData mock_quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -2723,7 +2723,7 @@
client_maker_.MakeDummyCHLOPacket(1)); // CHLO
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_FORWARD_SECURE);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
quic_data2.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket(2));
quic_data2.AddSocketDataToFactory(&socket_factory_);
@@ -2861,7 +2861,7 @@
client_maker_.MakeDummyCHLOPacket(1)); // CHLO
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_FORWARD_SECURE);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
quic_data2.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket(2));
quic_data2.AddSocketDataToFactory(&socket_factory_);
@@ -2981,7 +2981,7 @@
std::string header = ConstructDataHeader(body.length());
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_FORWARD_SECURE);
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
quic_data2.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -3071,7 +3071,7 @@
client_maker_.set_save_packet_frames(true);
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -3083,7 +3083,7 @@
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_FORWARD_SECURE);
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
// TLP 1
quic_data.AddWrite(SYNCHRONOUS, client_maker_.MakeRetransmissionPacket(
1, packet_num++, true));
@@ -3190,7 +3190,7 @@
client_maker_.set_save_packet_frames(true);
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
quic_data.AddWrite(
SYNCHRONOUS, client_maker_.MakeInitialSettingsPacket(packet_number++));
}
@@ -3201,7 +3201,7 @@
true, priority, GetRequestHeaders("GET", "https", "/"), 0, nullptr));
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_FORWARD_SECURE);
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
// TLP 1
quic_data.AddWrite(SYNCHRONOUS,
client_maker_.MakeRetransmissionPacket(1, 3, true));
@@ -3313,7 +3313,7 @@
client_maker_.set_save_packet_frames(true);
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
quic_data.AddWrite(
SYNCHRONOUS, client_maker_.MakeInitialSettingsPacket(packet_number++));
}
@@ -3325,7 +3325,7 @@
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_FORWARD_SECURE);
- if (!VersionUsesQpack(version_.transport_version)) {
+ if (!VersionUsesHttp3(version_.transport_version)) {
quic_data.AddWrite(SYNCHRONOUS,
client_maker_.MakeRstPacket(
packet_number++, true,
@@ -3494,7 +3494,7 @@
MockQuicData quic_data(version_);
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -3571,7 +3571,7 @@
client_maker_.set_save_packet_frames(true);
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
quic_data.AddWrite(SYNCHRONOUS,
client_maker_.MakeInitialSettingsPacket(packet_num++));
}
@@ -3582,7 +3582,7 @@
true, priority, GetRequestHeaders("GET", "https", "/"), 0, nullptr));
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_FORWARD_SECURE);
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
// TLP 1
quic_data.AddWrite(SYNCHRONOUS, client_maker_.MakeRetransmissionPacket(
1, packet_num++, true));
@@ -3711,7 +3711,7 @@
MockQuicData quic_data(version_);
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -3822,7 +3822,7 @@
MockQuicData quic_data(version_);
uint64_t packet_number = 1;
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_number++));
}
@@ -3934,7 +3934,7 @@
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -4036,7 +4036,7 @@
MockQuicData mock_quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -4115,7 +4115,7 @@
crypto_client_stream_factory_.AddProofVerifyDetails(&verify_details);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -4265,7 +4265,7 @@
// alternative service list.
MockQuicData mock_quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -4338,7 +4338,7 @@
// alternative service list.
MockQuicData mock_quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -4424,7 +4424,7 @@
MockQuicData mock_quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -4514,7 +4514,7 @@
MockQuicData mock_quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -4655,7 +4655,7 @@
client_maker_.set_hostname("www.example.org");
MockQuicData mock_quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -4767,7 +4767,7 @@
MockQuicData mock_quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -4845,7 +4845,7 @@
MockQuicData mock_quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -4914,7 +4914,7 @@
MockQuicData mock_quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -4954,7 +4954,7 @@
MockQuicData mock_quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -5061,7 +5061,7 @@
MockQuicData mock_quic_data(version_);
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -5103,7 +5103,7 @@
MockQuicData mock_quic_data(version_);
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(
SYNCHRONOUS, client_maker_.MakeInitialSettingsPacket(packet_number++));
}
@@ -5175,7 +5175,7 @@
MockQuicData mock_quic_data(version_);
int packet_num = 1;
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -5234,7 +5234,7 @@
uint64_t packet_number = 1;
MockQuicData mock_quic_data(version_);
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(
SYNCHRONOUS, client_maker_.MakeInitialSettingsPacket(packet_number++));
}
@@ -5317,7 +5317,7 @@
uint64_t packet_number = 1;
MockQuicData mock_quic_data(version_);
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(
SYNCHRONOUS, client_maker_.MakeInitialSettingsPacket(packet_number++));
}
@@ -5406,7 +5406,7 @@
MockQuicData mock_quic_data(version_);
int packet_num = 1;
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -5463,7 +5463,7 @@
MockQuicData mock_quic_data(version_);
int packet_num = 1;
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -5524,7 +5524,7 @@
MockQuicData mock_quic_data(version_);
int packet_num = 1;
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -5595,7 +5595,7 @@
MockQuicData mock_quic_data(version_);
int packet_num = 1;
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -5789,7 +5789,7 @@
MockQuicData mock_quic_data(version_);
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_number++));
}
@@ -5855,7 +5855,7 @@
MockQuicData mock_quic_data(version_);
int packet_num = 1;
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -6212,7 +6212,7 @@
test_socket_performance_watcher_factory_.rtt_notification_received());
MockQuicData mock_quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -6298,7 +6298,7 @@
HostPortPair::FromString("mail.example.org:443"));
MockQuicData mock_quic_data(version_);
- if (!VersionUsesQpack(version_.transport_version))
+ if (!VersionUsesHttp3(version_.transport_version))
mock_quic_data.AddRead(SYNCHRONOUS, OK);
else
mock_quic_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
@@ -6345,7 +6345,7 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
socket_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -6392,7 +6392,7 @@
MockQuicData socket_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
socket_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -6434,7 +6434,7 @@
MockQuicData socket_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
socket_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -6477,7 +6477,7 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING); // No more data to read
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket(1));
for (int i = 0; i < 13; ++i) { // 12 retries then one final failure.
socket_data.AddWrite(ASYNC, ERR_NO_BUFFER_SPACE);
@@ -6514,7 +6514,7 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING); // No more data to read
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket(1));
for (int i = 0; i < 13; ++i) { // 12 retries then one final failure.
socket_data.AddWrite(ASYNC, ERR_NO_BUFFER_SPACE);
@@ -6555,7 +6555,7 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
socket_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -6587,7 +6587,7 @@
MockQuicData mock_quic_data(version_);
uint64_t client_packet_number = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(
SYNCHRONOUS, ConstructInitialSettingsPacket(client_packet_number++));
}
@@ -6604,8 +6604,8 @@
GetRequestHeaders("GET", "https", "/pushed.jpg"), &server_maker_));
if ((client_headers_include_h2_stream_dependency_ &&
version_.transport_version >= quic::QUIC_VERSION_43 &&
- !VersionHasStreamType(version_.transport_version)) ||
- (VersionHasStreamType(version_.transport_version) &&
+ !VersionUsesHttp3(version_.transport_version)) ||
+ (VersionUsesHttp3(version_.transport_version) &&
FLAGS_quic_allow_http3_priority)) {
mock_quic_data.AddWrite(
SYNCHRONOUS,
@@ -6679,7 +6679,7 @@
MockQuicData mock_quic_data(version_);
uint64_t client_packet_number = 1;
// Initial SETTINGS frame.
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(
SYNCHRONOUS, ConstructInitialSettingsPacket(client_packet_number++));
}
@@ -6698,8 +6698,8 @@
GetRequestHeaders("GET", "https", "/pushed.jpg"), &server_maker_));
if ((client_headers_include_h2_stream_dependency_ &&
version_.transport_version >= quic::QUIC_VERSION_43 &&
- !VersionHasStreamType(version_.transport_version)) ||
- (VersionHasStreamType(version_.transport_version) &&
+ !VersionUsesHttp3(version_.transport_version)) ||
+ (VersionUsesHttp3(version_.transport_version) &&
FLAGS_quic_allow_http3_priority)) {
mock_quic_data.AddWrite(
SYNCHRONOUS,
@@ -6771,7 +6771,7 @@
MockQuicData mock_quic_data(version_);
int write_packet_index = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(
SYNCHRONOUS, ConstructInitialSettingsPacket(write_packet_index++));
}
@@ -6866,7 +6866,7 @@
MockQuicData mock_quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -6885,7 +6885,7 @@
GetResponseHeaders("200 OK")));
quic::QuicStreamOffset expected_raw_header_response_size =
server_maker_.stream_offset(
- quic::VersionUsesQpack(version_.transport_version)
+ quic::VersionUsesHttp3(version_.transport_version)
? GetNthClientInitiatedBidirectionalStreamId(0)
: quic::QuicUtils::GetHeadersStreamId(
version_.transport_version));
@@ -6938,7 +6938,7 @@
MockQuicData mock_quic_data(version_);
uint64_t client_packet_number = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(
SYNCHRONOUS, ConstructInitialSettingsPacket(client_packet_number++));
}
@@ -6960,7 +6960,7 @@
GetNthServerInitiatedUnidirectionalStreamId(0), false,
GetRequestHeaders("GET", "https", "/pushed.jpg"), &server_maker_));
quic::QuicStreamOffset push_promise_offset = 0;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
push_promise_offset = server_maker_.stream_offset(
GetNthClientInitiatedBidirectionalStreamId(0)) -
initial;
@@ -6968,8 +6968,8 @@
if ((client_headers_include_h2_stream_dependency_ &&
version_.transport_version >= quic::QUIC_VERSION_43 &&
- !VersionHasStreamType(version_.transport_version)) ||
- (VersionHasStreamType(version_.transport_version) &&
+ !VersionUsesHttp3(version_.transport_version)) ||
+ (VersionUsesHttp3(version_.transport_version) &&
(FLAGS_quic_allow_http3_priority))) {
mock_quic_data.AddWrite(
SYNCHRONOUS,
@@ -6980,7 +6980,7 @@
}
const quic::QuicStreamOffset initial_offset = server_maker_.stream_offset(
- quic::VersionUsesQpack(version_.transport_version)
+ quic::VersionUsesHttp3(version_.transport_version)
? GetNthClientInitiatedBidirectionalStreamId(0)
: quic::QuicUtils::GetHeadersStreamId(version_.transport_version));
mock_quic_data.AddRead(
@@ -6988,7 +6988,7 @@
2, GetNthClientInitiatedBidirectionalStreamId(0), false, false,
GetResponseHeaders("200 OK")));
const quic::QuicStreamOffset final_offset = server_maker_.stream_offset(
- quic::VersionUsesQpack(version_.transport_version)
+ quic::VersionUsesHttp3(version_.transport_version)
? GetNthClientInitiatedBidirectionalStreamId(0)
: quic::QuicUtils::GetHeadersStreamId(version_.transport_version));
quic::QuicStreamOffset expected_raw_header_response_size =
@@ -7066,7 +7066,7 @@
MockQuicData mock_quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -7448,7 +7448,7 @@
MockQuicData mock_quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket(
packet_num++, &client_maker));
}
@@ -7551,7 +7551,7 @@
MockQuicData mock_quic_data1(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data1.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket(
packet_num++, &client_maker1));
}
@@ -7586,7 +7586,7 @@
MockQuicData mock_quic_data2(version_);
int packet_num2 = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data2.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket(
packet_num2++, &client_maker2));
}
@@ -7625,7 +7625,7 @@
MockQuicData mock_quic_data(version_);
uint64_t client_packet_number = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(
SYNCHRONOUS, ConstructInitialSettingsPacket(client_packet_number++));
}
@@ -7643,8 +7643,8 @@
if ((client_headers_include_h2_stream_dependency_ &&
version_.transport_version >= quic::QUIC_VERSION_43 &&
- !VersionHasStreamType(version_.transport_version)) ||
- (VersionHasStreamType(version_.transport_version) &&
+ !VersionUsesHttp3(version_.transport_version)) ||
+ (VersionUsesHttp3(version_.transport_version) &&
FLAGS_quic_allow_http3_priority)) {
mock_quic_data.AddWrite(
SYNCHRONOUS,
@@ -7755,7 +7755,7 @@
MockQuicData mock_quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -7820,7 +7820,7 @@
MockQuicData mock_quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -7915,7 +7915,7 @@
MockQuicData mock_quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -8016,7 +8016,7 @@
MockQuicData mock_quic_data(version_);
int write_packet_index = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(
SYNCHRONOUS, ConstructInitialSettingsPacket(write_packet_index++));
}
@@ -8169,7 +8169,7 @@
MockQuicData mock_quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -8341,7 +8341,7 @@
MockQuicData mock_quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -8393,7 +8393,7 @@
MockQuicData mock_quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -8434,7 +8434,7 @@
MockQuicData mock_quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -8560,7 +8560,7 @@
MockQuicData mock_quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -8613,7 +8613,7 @@
MockQuicData mock_quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -8654,7 +8654,7 @@
const RequestPriority kRequestPriority2 = LOWEST;
MockQuicData mock_quic_data(version_);
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(ASYNC, ConstructInitialSettingsPacket(1));
mock_quic_data.AddWrite(SYNCHRONOUS, ERR_FAILED);
} else {
@@ -8745,7 +8745,7 @@
quic::QuicStreamOffset server_data_offset = 0;
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(
SYNCHRONOUS, client_maker->MakeInitialSettingsPacket(packet_num++));
}
@@ -8896,7 +8896,7 @@
return;
}
- if (quic::VersionUsesQpack(version_.transport_version)) {
+ if (quic::VersionUsesHttp3(version_.transport_version)) {
// HTTP/3 currently doesn't support PRIORITY.
return;
}
@@ -8917,7 +8917,7 @@
MockQuicData mock_quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -9145,7 +9145,7 @@
&clock_, kDefaultServerHostName, quic::Perspective::IS_SERVER, false);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
unpartitioned_mock_quic_data.AddWrite(
SYNCHRONOUS, client_maker1.MakeInitialSettingsPacket(packet_num++));
}
@@ -9221,7 +9221,7 @@
&clock_, kDefaultServerHostName, quic::Perspective::IS_SERVER, false);
int packet_num2 = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
partitioned_mock_quic_data1.AddWrite(
SYNCHRONOUS,
client_maker2.MakeInitialSettingsPacket(packet_num2++));
@@ -9279,7 +9279,7 @@
&clock_, kDefaultServerHostName, quic::Perspective::IS_SERVER, false);
int packet_num3 = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
partitioned_mock_quic_data2.AddWrite(
SYNCHRONOUS,
client_maker3.MakeInitialSettingsPacket(packet_num3++));
@@ -9403,7 +9403,7 @@
&clock_, kDefaultServerHostName, quic::Perspective::IS_SERVER, false);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data[index]->AddWrite(
SYNCHRONOUS, client_maker.MakeInitialSettingsPacket(packet_num++));
}
diff --git a/net/quic/quic_proxy_client_socket_unittest.cc b/net/quic/quic_proxy_client_socket_unittest.cc
index 444f746..96d156a 100644
--- a/net/quic/quic_proxy_client_socket_unittest.cc
+++ b/net/quic/quic_proxy_client_socket_unittest.cc
@@ -613,7 +613,7 @@
TEST_P(QuicProxyClientSocketTest, ConnectSendsCorrectRequest) {
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data_.AddWrite(SYNCHRONOUS,
ConstructSettingsPacket(packet_number++));
}
@@ -638,7 +638,7 @@
TEST_P(QuicProxyClientSocketTest, ConnectWithAuthRequested) {
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data_.AddWrite(SYNCHRONOUS,
ConstructSettingsPacket(packet_number++));
}
@@ -662,7 +662,7 @@
TEST_P(QuicProxyClientSocketTest, ConnectWithAuthCredentials) {
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data_.AddWrite(SYNCHRONOUS,
ConstructSettingsPacket(packet_number++));
}
@@ -693,7 +693,7 @@
// Tests that a redirect response from a CONNECT fails.
TEST_P(QuicProxyClientSocketTest, ConnectRedirects) {
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data_.AddWrite(SYNCHRONOUS,
ConstructSettingsPacket(packet_number++));
}
@@ -724,7 +724,7 @@
TEST_P(QuicProxyClientSocketTest, ConnectFails) {
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data_.AddWrite(SYNCHRONOUS,
ConstructSettingsPacket(packet_number++));
}
@@ -743,7 +743,7 @@
TEST_P(QuicProxyClientSocketTest, WasEverUsedReturnsCorrectValue) {
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data_.AddWrite(SYNCHRONOUS,
ConstructSettingsPacket(packet_number++));
}
@@ -757,7 +757,7 @@
Initialize();
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
EXPECT_TRUE(sock_->WasEverUsed()); // Used due to crypto handshake
AssertConnectSucceeds();
EXPECT_TRUE(sock_->WasEverUsed());
@@ -767,7 +767,7 @@
TEST_P(QuicProxyClientSocketTest, GetPeerAddressReturnsCorrectValues) {
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data_.AddWrite(SYNCHRONOUS,
ConstructSettingsPacket(packet_number++));
}
@@ -798,7 +798,7 @@
TEST_P(QuicProxyClientSocketTest, IsConnectedAndIdle) {
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data_.AddWrite(SYNCHRONOUS,
ConstructSettingsPacket(packet_number++));
}
@@ -837,7 +837,7 @@
TEST_P(QuicProxyClientSocketTest, GetTotalReceivedBytes) {
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data_.AddWrite(SYNCHRONOUS,
ConstructSettingsPacket(packet_number++));
}
@@ -885,7 +885,7 @@
TEST_P(QuicProxyClientSocketTest, SetStreamPriority) {
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data_.AddWrite(SYNCHRONOUS, ConstructSettingsPacket(1));
}
// Despite setting the priority to HIGHEST, the requets initial priority of
@@ -906,7 +906,7 @@
TEST_P(QuicProxyClientSocketTest, WriteSendsDataInDataFrame) {
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data_.AddWrite(SYNCHRONOUS,
ConstructSettingsPacket(packet_number++));
}
@@ -950,7 +950,7 @@
TEST_P(QuicProxyClientSocketTest, WriteSplitsLargeDataIntoMultiplePackets) {
int write_packet_index = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data_.AddWrite(SYNCHRONOUS,
ConstructSettingsPacket(write_packet_index++));
}
@@ -1034,7 +1034,7 @@
TEST_P(QuicProxyClientSocketTest, ReadReadsDataInDataFrame) {
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data_.AddWrite(SYNCHRONOUS,
ConstructSettingsPacket(packet_number++));
}
@@ -1063,7 +1063,7 @@
TEST_P(QuicProxyClientSocketTest, ReadDataFromBufferedFrames) {
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data_.AddWrite(SYNCHRONOUS,
ConstructSettingsPacket(packet_number++));
}
@@ -1101,7 +1101,7 @@
TEST_P(QuicProxyClientSocketTest, ReadDataMultipleBufferedFrames) {
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data_.AddWrite(SYNCHRONOUS,
ConstructSettingsPacket(packet_number++));
}
@@ -1137,7 +1137,7 @@
TEST_P(QuicProxyClientSocketTest, LargeReadWillMergeDataFromDifferentFrames) {
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data_.AddWrite(SYNCHRONOUS,
ConstructSettingsPacket(packet_number++));
}
@@ -1173,7 +1173,7 @@
TEST_P(QuicProxyClientSocketTest, MultipleShortReadsThenMoreRead) {
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data_.AddWrite(SYNCHRONOUS,
ConstructSettingsPacket(packet_number++));
}
@@ -1227,7 +1227,7 @@
TEST_P(QuicProxyClientSocketTest, ReadWillSplitDataFromLargeFrame) {
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data_.AddWrite(SYNCHRONOUS,
ConstructSettingsPacket(packet_number++));
}
@@ -1266,7 +1266,7 @@
TEST_P(QuicProxyClientSocketTest, MultipleReadsFromSameLargeFrame) {
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data_.AddWrite(SYNCHRONOUS,
ConstructSettingsPacket(packet_number++));
}
@@ -1307,7 +1307,7 @@
TEST_P(QuicProxyClientSocketTest, ReadAuthResponseBody) {
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data_.AddWrite(SYNCHRONOUS,
ConstructSettingsPacket(packet_number++));
}
@@ -1344,7 +1344,7 @@
TEST_P(QuicProxyClientSocketTest, ReadErrorResponseBody) {
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data_.AddWrite(SYNCHRONOUS,
ConstructSettingsPacket(packet_number++));
}
@@ -1376,7 +1376,7 @@
TEST_P(QuicProxyClientSocketTest, AsyncReadAroundWrite) {
int write_packet_index = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data_.AddWrite(SYNCHRONOUS,
ConstructSettingsPacket(write_packet_index++));
}
@@ -1437,7 +1437,7 @@
TEST_P(QuicProxyClientSocketTest, AsyncWriteAroundReads) {
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data_.AddWrite(SYNCHRONOUS,
ConstructSettingsPacket(packet_number++));
}
@@ -1509,7 +1509,7 @@
// Reading from an already closed socket should return 0
TEST_P(QuicProxyClientSocketTest, ReadOnClosedSocketReturnsZero) {
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data_.AddWrite(SYNCHRONOUS,
ConstructSettingsPacket(packet_number++));
}
@@ -1536,7 +1536,7 @@
// Read pending when socket is closed should return 0
TEST_P(QuicProxyClientSocketTest, PendingReadOnCloseReturnsZero) {
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data_.AddWrite(SYNCHRONOUS,
ConstructSettingsPacket(packet_number++));
}
@@ -1561,7 +1561,7 @@
// Reading from a disconnected socket is an error
TEST_P(QuicProxyClientSocketTest, ReadOnDisconnectSocketReturnsNotConnected) {
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data_.AddWrite(SYNCHRONOUS,
ConstructSettingsPacket(packet_number++));
}
@@ -1587,7 +1587,7 @@
// FIN, then 0.
TEST_P(QuicProxyClientSocketTest, ReadAfterFinReceivedReturnsBufferedData) {
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data_.AddWrite(SYNCHRONOUS,
ConstructSettingsPacket(packet_number++));
}
@@ -1624,7 +1624,7 @@
// Calling Write() on a closed socket is an error.
TEST_P(QuicProxyClientSocketTest, WriteOnClosedStream) {
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data_.AddWrite(SYNCHRONOUS,
ConstructSettingsPacket(packet_number++));
}
@@ -1647,7 +1647,7 @@
// Calling Write() on a disconnected socket is an error.
TEST_P(QuicProxyClientSocketTest, WriteOnDisconnectedSocket) {
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data_.AddWrite(SYNCHRONOUS,
ConstructSettingsPacket(packet_number++));
}
@@ -1672,7 +1672,7 @@
// with the same error the session was closed with.
TEST_P(QuicProxyClientSocketTest, WritePendingOnClose) {
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data_.AddWrite(SYNCHRONOUS,
ConstructSettingsPacket(packet_number++));
}
@@ -1708,7 +1708,7 @@
TEST_P(QuicProxyClientSocketTest, DisconnectWithWritePending) {
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data_.AddWrite(SYNCHRONOUS,
ConstructSettingsPacket(packet_number++));
}
@@ -1748,7 +1748,7 @@
// should not be called.
TEST_P(QuicProxyClientSocketTest, DisconnectWithReadPending) {
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data_.AddWrite(SYNCHRONOUS,
ConstructSettingsPacket(packet_number++));
}
@@ -1781,7 +1781,7 @@
// both should be called back.
TEST_P(QuicProxyClientSocketTest, RstWithReadAndWritePending) {
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data_.AddWrite(SYNCHRONOUS,
ConstructSettingsPacket(packet_number++));
}
@@ -1839,7 +1839,7 @@
// and only the expected NetLog events (No SpdySession events).
TEST_P(QuicProxyClientSocketTest, NetLog) {
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data_.AddWrite(SYNCHRONOUS,
ConstructSettingsPacket(packet_number++));
}
@@ -1927,7 +1927,7 @@
// not be called.
TEST_P(QuicProxyClientSocketTest, RstWithReadAndWritePendingDelete) {
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data_.AddWrite(SYNCHRONOUS,
ConstructSettingsPacket(packet_number++));
}
diff --git a/net/quic/quic_stream_factory.cc b/net/quic/quic_stream_factory.cc
index 5579d1f8..230e153 100644
--- a/net/quic/quic_stream_factory.cc
+++ b/net/quic/quic_stream_factory.cc
@@ -1979,9 +1979,9 @@
return ERR_CONNECTION_CLOSED;
}
if (connection->version().KnowsWhichDecrypterToUse()) {
- connection->InstallDecrypter(quic::ENCRYPTION_FORWARD_SECURE,
- quic::QuicMakeUnique<quic::NullDecrypter>(
- quic::Perspective::IS_CLIENT));
+ connection->InstallDecrypter(
+ quic::ENCRYPTION_FORWARD_SECURE,
+ std::make_unique<quic::NullDecrypter>(quic::Perspective::IS_CLIENT));
}
return OK;
}
diff --git a/net/quic/quic_stream_factory_test.cc b/net/quic/quic_stream_factory_test.cc
index 197d36c..308a4a2 100644
--- a/net/quic/quic_stream_factory_test.cc
+++ b/net/quic/quic_stream_factory_test.cc
@@ -355,7 +355,7 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data.AddSocketDataToFactory(socket_factory_.get());
@@ -498,7 +498,7 @@
MockQuicData socket_data2(version_);
socket_data2.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
socket_data2.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -723,7 +723,7 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data.AddSocketDataToFactory(socket_factory_.get());
@@ -761,7 +761,7 @@
MockQuicData socket_data2(version_);
socket_data2.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
client_maker_.Reset();
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data2.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data2.AddSocketDataToFactory(socket_factory_.get());
@@ -932,7 +932,7 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data.AddSocketDataToFactory(socket_factory_.get());
@@ -987,7 +987,7 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data.AddSocketDataToFactory(socket_factory_.get());
@@ -1018,7 +1018,7 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data.AddSocketDataToFactory(socket_factory_.get());
@@ -1047,7 +1047,7 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data.AddSocketDataToFactory(socket_factory_.get());
@@ -1079,7 +1079,7 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data.AddSocketDataToFactory(socket_factory_.get());
@@ -1123,7 +1123,7 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data.AddSocketDataToFactory(socket_factory_.get());
@@ -1162,7 +1162,7 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data.AddSocketDataToFactory(socket_factory_.get());
@@ -1226,7 +1226,7 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
socket_data.AddWrite(SYNCHRONOUS,
packet_maker.MakeInitialSettingsPacket(1));
}
@@ -1270,7 +1270,7 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data.AddSocketDataToFactory(socket_factory_.get());
@@ -1304,7 +1304,7 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data.AddSocketDataToFactory(socket_factory_.get());
@@ -1333,7 +1333,7 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data.AddSocketDataToFactory(socket_factory_.get());
@@ -1366,7 +1366,7 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data.AddSocketDataToFactory(socket_factory_.get());
@@ -1442,7 +1442,7 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
socket_data.AddWrite(SYNCHRONOUS,
packet_maker.MakeInitialSettingsPacket(1));
}
@@ -1533,7 +1533,7 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data.AddSocketDataToFactory(socket_factory_.get());
@@ -1593,7 +1593,7 @@
MockQuicData socket_data1(version_);
socket_data1.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data1.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data1.AddSocketDataToFactory(socket_factory_.get());
@@ -1628,13 +1628,13 @@
MockQuicData socket_data1(version_);
socket_data1.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data1.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data1.AddSocketDataToFactory(socket_factory_.get());
client_maker_.Reset();
MockQuicData socket_data2(version_);
socket_data2.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data2.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data2.AddSocketDataToFactory(socket_factory_.get());
@@ -1693,7 +1693,7 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data.AddSocketDataToFactory(socket_factory_.get());
@@ -1738,7 +1738,7 @@
Initialize();
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data.AddSocketDataToFactory(socket_factory_.get());
@@ -1790,13 +1790,13 @@
MockQuicData socket_data1(version_);
socket_data1.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data1.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data1.AddSocketDataToFactory(socket_factory_.get());
client_maker_.Reset();
MockQuicData socket_data2(version_);
socket_data2.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data2.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data2.AddSocketDataToFactory(socket_factory_.get());
@@ -1859,13 +1859,13 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data.AddSocketDataToFactory(socket_factory_.get());
client_maker_.Reset();
MockQuicData socket_data2(version_);
socket_data2.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data2.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data2.AddSocketDataToFactory(socket_factory_.get());
@@ -2054,7 +2054,7 @@
Initialize();
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data.AddSocketDataToFactory(socket_factory_.get());
{
@@ -2094,7 +2094,7 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
socket_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -2110,7 +2110,7 @@
client_maker_.Reset();
MockQuicData socket_data2(version_);
socket_data2.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data2.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data2.AddSocketDataToFactory(socket_factory_.get());
@@ -2194,7 +2194,7 @@
client_maker_.Reset();
MockQuicData socket_data2(version_);
socket_data2.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data2.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data2.AddSocketDataToFactory(socket_factory_.get());
@@ -2262,7 +2262,7 @@
client_maker_.Reset();
MockQuicData socket_data2(version_);
socket_data2.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data2.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data2.AddSocketDataToFactory(socket_factory_.get());
@@ -2303,7 +2303,7 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
socket_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -2319,7 +2319,7 @@
client_maker_.Reset();
MockQuicData socket_data2(version_);
socket_data2.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data2.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data2.AddSocketDataToFactory(socket_factory_.get());
@@ -2393,7 +2393,7 @@
MockQuicData quic_data1(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
quic_data1.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -2413,7 +2413,7 @@
client_maker_.Reset();
MockQuicData quic_data2(version_);
quic_data2.AddRead(SYNCHRONOUS, ERR_IO_PENDING); // Hanging read.
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
quic_data2.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket(1));
quic_data2.AddSocketDataToFactory(socket_factory_.get());
@@ -2499,7 +2499,7 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
socket_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -2575,7 +2575,7 @@
MockQuicData quic_data1(version_);
quic_data1.AddRead(SYNCHRONOUS, ERR_IO_PENDING); // Hanging Read.
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
quic_data1.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -2754,7 +2754,7 @@
MockQuicData quic_data1(version_);
quic_data1.AddRead(SYNCHRONOUS, ERR_IO_PENDING); // Hanging Read.
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
quic_data1.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -2935,7 +2935,7 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data.AddSocketDataToFactory(socket_factory_.get());
@@ -3020,7 +3020,7 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
socket_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -3119,7 +3119,7 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
socket_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -3197,7 +3197,7 @@
if (migrate_idle_sessions) {
failed_socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
failed_socket_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -3219,7 +3219,7 @@
} else {
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
socket_data.AddWrite(
@@ -3288,7 +3288,7 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
socket_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -3362,7 +3362,7 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
socket_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -3448,7 +3448,7 @@
MockQuicData default_socket_data(version_);
default_socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
default_socket_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -3524,7 +3524,7 @@
int packet_number = 1;
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
socket_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_number++));
}
@@ -3650,7 +3650,7 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
socket_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -3784,7 +3784,7 @@
int packet_number = 1;
MockQuicData quic_data1(version_);
quic_data1.AddRead(SYNCHRONOUS, ERR_IO_PENDING); // Hanging Read.
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
quic_data1.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_number++));
}
@@ -3962,7 +3962,7 @@
int packet_number = 1;
MockQuicData quic_data1(version_);
quic_data1.AddRead(SYNCHRONOUS, ERR_IO_PENDING); // Hanging Read.
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
quic_data1.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_number++));
}
@@ -4172,7 +4172,7 @@
int packet_number = 1;
MockQuicData quic_data1(version_);
quic_data1.AddRead(SYNCHRONOUS, ERR_IO_PENDING); // Hanging Read.
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
quic_data1.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_number++));
}
@@ -4308,7 +4308,7 @@
MockQuicData quic_data1(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
quic_data1.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -4328,7 +4328,7 @@
client_maker_.Reset();
MockQuicData quic_data2(version_);
quic_data2.AddRead(SYNCHRONOUS, ERR_IO_PENDING); // Hanging read.
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
quic_data2.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
quic_data2.AddSocketDataToFactory(socket_factory_.get());
@@ -4425,7 +4425,7 @@
MockQuicData quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -4547,7 +4547,7 @@
int packet_number = 1;
MockQuicData quic_data1(version_);
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
quic_data1.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_number++));
}
@@ -4716,7 +4716,7 @@
MockQuicData quic_data1(version_);
quic_data1.AddRead(SYNCHRONOUS, ERR_IO_PENDING); // Hanging Read.
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
quic_data1.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -4873,14 +4873,14 @@
MockQuicData socket_data1(version_);
socket_data1.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data1.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data1.AddWrite(ASYNC, OK);
socket_data1.AddSocketDataToFactory(socket_factory_.get());
client_maker_.Reset();
MockQuicData socket_data2(version_);
socket_data2.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data2.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data2.AddWrite(ASYNC, OK);
socket_data2.AddSocketDataToFactory(socket_factory_.get());
@@ -5001,7 +5001,7 @@
MockQuicData quic_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -5104,7 +5104,7 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
socket_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -5203,7 +5203,7 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
socket_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -5281,7 +5281,7 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
socket_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -5439,7 +5439,7 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
socket_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -5746,7 +5746,7 @@
socket_data2.AddRead(ASYNC, ERR_IO_PENDING); // Pause.
// Change the encryption level after handshake is confirmed.
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_FORWARD_SECURE);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data2.AddWrite(ASYNC, ConstructInitialSettingsPacket(packet_num++));
socket_data2.AddWrite(
ASYNC, ConstructGetRequestPacket(
@@ -5909,7 +5909,7 @@
client_maker_.Reset();
MockQuicData socket_data2(version_);
socket_data2.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data2.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data2.AddSocketDataToFactory(socket_factory_.get());
@@ -5970,7 +5970,7 @@
socket_data2.AddRead(ASYNC, ERR_IO_PENDING); // Pause.
// Change the encryption level after handshake is confirmed.
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_FORWARD_SECURE);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data2.AddWrite(ASYNC, ConstructInitialSettingsPacket(packet_num++));
socket_data2.AddWrite(
ASYNC, ConstructGetRequestPacket(
@@ -6053,7 +6053,7 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
socket_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -6155,7 +6155,7 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data.AddWrite(write_error_mode, ERR_ADDRESS_UNREACHABLE);
socket_data.AddSocketDataToFactory(socket_factory_.get());
@@ -6267,7 +6267,7 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
socket_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -6405,7 +6405,7 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
socket_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_number++));
}
@@ -6544,7 +6544,7 @@
int packet_number = 1;
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
socket_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_number++));
}
@@ -6692,7 +6692,7 @@
if (migrate_idle_sessions) {
// The socket data provider for the original socket before migration.
failed_socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
failed_socket_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -6718,7 +6718,7 @@
socket_data.AddSocketDataToFactory(socket_factory_.get());
} else {
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data.AddWrite(write_error_mode, ERR_ADDRESS_UNREACHABLE);
socket_data.AddSocketDataToFactory(socket_factory_.get());
@@ -6807,7 +6807,7 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data.AddWrite(write_error_mode, ERR_ADDRESS_UNREACHABLE);
socket_data.AddSocketDataToFactory(socket_factory_.get());
@@ -6899,7 +6899,7 @@
MockQuicData socket_data1(version_);
socket_data1.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
socket_data1.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -7071,7 +7071,7 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
socket_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -7209,7 +7209,7 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
socket_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -7353,7 +7353,7 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING); // Hanging read.
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
socket_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -7486,7 +7486,7 @@
MockQuicData socket_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
socket_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -7599,7 +7599,7 @@
MockQuicData socket_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
socket_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -7718,7 +7718,7 @@
MockQuicData socket_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
socket_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -7839,7 +7839,7 @@
MockQuicData socket_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
socket_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -7996,7 +7996,7 @@
MockQuicData socket_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
socket_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -8151,7 +8151,7 @@
MockQuicData socket_data1(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
socket_data1.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -8283,7 +8283,7 @@
MockQuicData socket_data1(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
socket_data1.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -8416,7 +8416,7 @@
MockQuicData socket_data1(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
socket_data1.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -8550,7 +8550,7 @@
MockQuicData socket_data1(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
socket_data1.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -8676,7 +8676,7 @@
MockQuicData socket_data(version_);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
socket_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -8826,7 +8826,7 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
socket_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -8974,7 +8974,7 @@
MockQuicData default_socket_data(version_);
default_socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
default_socket_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -9102,7 +9102,7 @@
MockQuicData default_socket_data(version_);
default_socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
default_socket_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -9217,7 +9217,7 @@
MockQuicData socket_data1(version_);
socket_data1.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
socket_data1.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -9372,7 +9372,7 @@
MockQuicData socket_data1(version_);
socket_data1.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
socket_data1.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -9433,14 +9433,14 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data.AddSocketDataToFactory(socket_factory_.get());
client_maker_.Reset();
MockQuicData socket_data2(version_);
socket_data2.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data2.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data2.AddSocketDataToFactory(socket_factory_.get());
@@ -9586,7 +9586,7 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data.AddSocketDataToFactory(socket_factory_.get());
@@ -9626,14 +9626,14 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data.AddSocketDataToFactory(socket_factory_.get());
client_maker_.Reset();
MockQuicData socket_data2(version_);
socket_data2.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data2.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data2.AddSocketDataToFactory(socket_factory_.get());
@@ -10051,7 +10051,7 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
// For the close socket message.
socket_data.AddWrite(SYNCHRONOUS, ERR_IO_PENDING);
@@ -10096,7 +10096,7 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data.AddSocketDataToFactory(socket_factory_.get());
@@ -10172,7 +10172,7 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ConstructClientConnectionClosePacket(1));
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data.AddRead(ASYNC, OK);
socket_data.AddSocketDataToFactory(socket_factory_.get());
@@ -10224,7 +10224,7 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ConstructClientConnectionClosePacket(1));
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data.AddRead(ASYNC, OK);
socket_data.AddSocketDataToFactory(socket_factory_.get());
@@ -10272,7 +10272,7 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data.AddSocketDataToFactory(socket_factory_.get());
@@ -10319,7 +10319,7 @@
MockQuicData socket_data1(version_);
socket_data1.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
socket_data1.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -10333,7 +10333,7 @@
client_maker_.Reset();
MockQuicData socket_data2(version_);
socket_data2.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data2.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data2.AddSocketDataToFactory(socket_factory_.get());
@@ -10399,7 +10399,7 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data.AddSocketDataToFactory(socket_factory_.get());
@@ -10562,7 +10562,7 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data.AddSocketDataToFactory(socket_factory_.get());
@@ -10634,13 +10634,13 @@
MockQuicData socket_data1(version_);
socket_data1.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data1.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data1.AddSocketDataToFactory(socket_factory_.get());
client_maker_.Reset();
MockQuicData socket_data2(version_);
socket_data2.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data2.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data2.AddSocketDataToFactory(socket_factory_.get());
@@ -10722,13 +10722,13 @@
MockQuicData socket_data1(version_);
socket_data1.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data1.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data1.AddSocketDataToFactory(socket_factory_.get());
client_maker_.Reset();
MockQuicData socket_data2(version_);
socket_data2.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data2.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data2.AddSocketDataToFactory(socket_factory_.get());
@@ -10861,7 +10861,7 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data.AddSocketDataToFactory(socket_factory_.get());
@@ -10890,7 +10890,7 @@
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data.AddSocketDataToFactory(socket_factory_.get());
@@ -11206,7 +11206,7 @@
MockQuicData quic_data(version_);
quic_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
quic_data.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
quic_data.AddSocketDataToFactory(socket_factory_.get());
@@ -11242,7 +11242,7 @@
MockQuicData quic_data(version_);
quic_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
quic_data.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
quic_data.AddSocketDataToFactory(socket_factory_.get());
@@ -11301,7 +11301,7 @@
MockQuicData quic_data(version_);
quic_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
quic_data.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
quic_data.AddSocketDataToFactory(socket_factory_.get());
@@ -11364,7 +11364,7 @@
MockQuicData quic_data(version_);
quic_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
quic_data.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
quic_data.AddSocketDataToFactory(socket_factory_.get());
@@ -11433,7 +11433,7 @@
MockQuicData quic_data(version_);
quic_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
quic_data.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
quic_data.AddSocketDataToFactory(socket_factory_.get());
@@ -11496,7 +11496,7 @@
MockQuicData quic_data(version_);
quic_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -11510,7 +11510,7 @@
client_maker_.Reset();
MockQuicData quic_data2(version_);
quic_data2.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
quic_data2.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
quic_data2.AddSocketDataToFactory(socket_factory_.get());
@@ -11575,7 +11575,7 @@
quic_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
int packet_num = 1;
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -11590,7 +11590,7 @@
MockQuicData quic_data2(version_);
quic_data2.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
quic_data2.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
}
quic_data2.AddSocketDataToFactory(socket_factory_.get());
@@ -11658,7 +11658,7 @@
quic_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_number++));
quic_data.AddWrite(SYNCHRONOUS,
@@ -11670,7 +11670,7 @@
client_maker_.Reset();
MockQuicData quic_data2(version_);
quic_data2.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
quic_data2.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
quic_data2.AddSocketDataToFactory(socket_factory_.get());
@@ -11782,7 +11782,7 @@
MockQuicData quic_data(version_);
quic_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
int packet_num = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_num++));
}
@@ -11895,7 +11895,7 @@
client_maker_.Reset();
MockQuicData quic_data2(version_);
quic_data2.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
quic_data2.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
quic_data2.AddSocketDataToFactory(socket_factory_.get());
@@ -12011,7 +12011,7 @@
quic_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_number++));
}
@@ -12069,7 +12069,7 @@
quic_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
int packet_number = 1;
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
quic_data.AddWrite(SYNCHRONOUS,
ConstructInitialSettingsPacket(packet_number++));
}
@@ -12111,7 +12111,7 @@
MockQuicData quic_data(version_);
quic_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
quic_data.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
quic_data.AddSocketDataToFactory(socket_factory_.get());
@@ -12170,7 +12170,7 @@
MockQuicData quic_data(version_);
quic_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
quic_data.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
quic_data.AddSocketDataToFactory(socket_factory_.get());
@@ -12178,7 +12178,7 @@
client_maker_.Reset();
MockQuicData quic_data2(version_);
quic_data2.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
quic_data2.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
quic_data2.AddSocketDataToFactory(socket_factory_.get());
@@ -12246,14 +12246,14 @@
MockQuicData quic_data(version_);
quic_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
quic_data.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
quic_data.AddSocketDataToFactory(socket_factory_.get());
client_maker_.Reset();
MockQuicData quic_data2(version_);
quic_data2.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
quic_data2.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
quic_data2.AddSocketDataToFactory(socket_factory_.get());
@@ -12316,7 +12316,7 @@
socket_data.AddWrite(ASYNC, client_maker_.MakeDummyCHLOPacket(1));
socket_data.AddWrite(ASYNC, client_maker_.MakeDummyCHLOPacket(2));
client_maker_.SetEncryptionLevel(quic::ENCRYPTION_FORWARD_SECURE);
- if (VersionUsesQpack(version_.transport_version)) {
+ if (VersionUsesHttp3(version_.transport_version)) {
socket_data.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket(3));
}
@@ -12372,13 +12372,13 @@
// Prepare to establish two QUIC sessions.
MockQuicData socket_data(version_);
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data.AddSocketDataToFactory(socket_factory_.get());
client_maker_.Reset();
MockQuicData socket_data2(version_);
socket_data2.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- if (VersionUsesQpack(version_.transport_version))
+ if (VersionUsesHttp3(version_.transport_version))
socket_data2.AddWrite(SYNCHRONOUS, ConstructInitialSettingsPacket());
socket_data2.AddSocketDataToFactory(socket_factory_.get());
diff --git a/net/quic/quic_test_packet_maker.cc b/net/quic/quic_test_packet_maker.cc
index b03014b..172e430 100644
--- a/net/quic/quic_test_packet_maker.cc
+++ b/net/quic/quic_test_packet_maker.cc
@@ -172,35 +172,28 @@
framer.SetEncrypter(encryption_level_,
std::make_unique<quic::NullEncrypter>(perspective_));
}
- size_t max_plaintext_size =
- framer.GetMaxPlaintextSize(quic::kDefaultMaxPacketSize);
- char buffer[quic::kDefaultMaxPacketSize];
- size_t length;
+
if (version_.transport_version != quic::QUIC_VERSION_99) {
- length = framer.BuildConnectivityProbingPacket(
- header_, buffer, max_plaintext_size, encryption_level_);
+ quic::QuicFrames frames{{quic::QuicFrame{quic::QuicPingFrame{}},
+ quic::QuicFrame{quic::QuicPaddingFrame{}}}};
+ return MakeMultipleFramesPacket(header_, frames, nullptr);
} else if (perspective_ == quic::Perspective::IS_CLIENT) {
quic::test::MockRandom rand(0);
quic::QuicPathFrameBuffer payload;
- length = framer.BuildPaddedPathChallengePacket(header_, buffer,
- max_plaintext_size, &payload,
- &rand, encryption_level_);
+ rand.RandBytes(payload.data(), payload.size());
+ quic::QuicPathChallengeFrame path_challenge(0, payload);
+ quic::QuicFrames frames{{quic::QuicFrame{&path_challenge},
+ quic::QuicFrame{quic::QuicPaddingFrame{}}}};
+ return MakeMultipleFramesPacket(header_, frames, nullptr);
} else {
quic::test::MockRandom rand(0);
quic::QuicPathFrameBuffer payload;
rand.RandBytes(payload.data(), payload.size());
- quic::QuicDeque<quic::QuicPathFrameBuffer> payloads{payload};
- length = framer.BuildPathResponsePacket(header_, buffer, max_plaintext_size,
- payloads, true, encryption_level_);
+ quic::QuicPathResponseFrame path_response(0, payload);
+ quic::QuicFrames frames{{quic::QuicFrame{&path_response},
+ quic::QuicFrame{quic::QuicPaddingFrame{}}}};
+ return MakeMultipleFramesPacket(header_, frames, nullptr);
}
- size_t encrypted_size = framer.EncryptInPlace(
- encryption_level_, header_.packet_number,
- GetStartOfEncryptedData(framer.transport_version(), header_), length,
- quic::kDefaultMaxPacketSize, buffer);
- EXPECT_EQ(quic::kDefaultMaxPacketSize, encrypted_size);
- quic::QuicReceivedPacket encrypted(buffer, encrypted_size, clock_->Now(),
- false);
- return encrypted.Clone();
}
std::unique_ptr<quic::QuicReceivedPacket> QuicTestPacketMaker::MakePingPacket(
@@ -361,7 +354,7 @@
DVLOG(1) << "Adding frame: " << frames.back();
}
- if (quic::VersionUsesQpack(version_.transport_version)) {
+ if (quic::VersionUsesHttp3(version_.transport_version)) {
// Send SETTINGS frame(s) if they have not already been sent.
MaybeAddHttp3SettingsFrames(&frames);
@@ -766,7 +759,7 @@
size_t* spdy_headers_frame_length,
const std::vector<std::string>& data_writes) {
InitializeHeader(packet_number, should_include_version);
- if (quic::VersionUsesQpack(version_.transport_version)) {
+ if (quic::VersionUsesHttp3(version_.transport_version)) {
quic::QuicFrames frames;
// Send SETTINGS frame(s) if they have not already been sent.
@@ -829,7 +822,7 @@
size_t* spdy_headers_frame_length) {
InitializeHeader(packet_number, should_include_version);
- if (quic::VersionUsesQpack(version_.transport_version)) {
+ if (quic::VersionUsesHttp3(version_.transport_version)) {
quic::QuicFrames frames;
// Send SETTINGS frame(s) if they have not already been sent.
@@ -871,7 +864,7 @@
quic::QuicStreamId parent_stream_id,
size_t* spdy_headers_frame_length,
quic::QuicRstStreamErrorCode error_code) {
- if (quic::VersionUsesQpack(version_.transport_version)) {
+ if (quic::VersionUsesHttp3(version_.transport_version)) {
quic::QuicFrames frames;
// Send SETTINGS frame(s) if they have not already been sent.
@@ -960,7 +953,7 @@
bool fin,
spdy::SpdyHeaderBlock headers,
size_t* spdy_headers_frame_length) {
- if (quic::VersionUsesQpack(version_.transport_version)) {
+ if (quic::VersionUsesHttp3(version_.transport_version)) {
std::string encoded_headers =
qpack_encoder_.EncodeHeaderList(stream_id, headers, nullptr);
quic::QuicFrames frames;
@@ -1024,7 +1017,7 @@
size_t* spdy_headers_frame_length) {
InitializeHeader(packet_number, should_include_version);
- if (quic::VersionUsesQpack(version_.transport_version)) {
+ if (quic::VersionUsesHttp3(version_.transport_version)) {
// STREAM frames for HEADERS.
std::vector<std::string> data = QpackEncodeHeaders(
stream_id, std::move(headers), spdy_headers_frame_length);
@@ -1179,7 +1172,7 @@
std::unique_ptr<quic::QuicReceivedPacket>
QuicTestPacketMaker::MakeInitialSettingsPacket(uint64_t packet_number) {
- if (!quic::VersionHasStreamType(version_.transport_version)) {
+ if (!quic::VersionUsesHttp3(version_.transport_version)) {
spdy::SpdySettingsIR settings_frame;
settings_frame.AddSetting(spdy::SETTINGS_MAX_HEADER_LIST_SIZE,
kQuicMaxHeaderListSize);
@@ -1208,14 +1201,14 @@
quic::QuicStreamId parent_stream_id,
spdy::SpdyPriority priority) {
if (!client_headers_include_h2_stream_dependency_ ||
- quic::VersionUsesQpack(version_.transport_version)) {
+ quic::VersionUsesHttp3(version_.transport_version)) {
// TODO(rch): both stream_dependencies and priority frames need to be
// supported in IETF QUIC.
parent_stream_id = 0;
}
int weight = spdy::Spdy3PriorityToHttp2Weight(priority);
bool exclusive = client_headers_include_h2_stream_dependency_;
- if (!VersionUsesQpack(version_.transport_version)) {
+ if (!VersionUsesHttp3(version_.transport_version)) {
spdy::SpdyPriorityIR priority_frame(id, parent_stream_id, weight,
exclusive);
spdy::SpdySerializedFrame spdy_frame(
@@ -1281,7 +1274,7 @@
spdy::SpdySerializedFrame* spdy_frame = spdy_frames.back().get();
frames.push_back(GenerateNextStreamFrame(
- quic::VersionUsesQpack(version_.transport_version)
+ quic::VersionUsesHttp3(version_.transport_version)
? GetFirstBidirectionalStreamId()
: GetHeadersStreamId(),
false, quic::QuicStringPiece(spdy_frame->data(), spdy_frame->size())));
@@ -1372,7 +1365,7 @@
quic::QuicStreamId stream_id,
spdy::SpdyHeaderBlock headers,
size_t* encoded_data_length) {
- DCHECK(quic::VersionUsesQpack(version_.transport_version));
+ DCHECK(quic::VersionUsesHttp3(version_.transport_version));
std::vector<std::string> data;
std::string encoded_headers =
@@ -1513,7 +1506,7 @@
void QuicTestPacketMaker::MaybeAddHttp3SettingsFrames(
quic::QuicFrames* frames) {
- DCHECK(quic::VersionUsesQpack(version_.transport_version));
+ DCHECK(quic::VersionUsesHttp3(version_.transport_version));
quic::QuicStreamId stream_id =
quic::QuicUtils::GetFirstUnidirectionalStreamId(
