Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(101)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/quic/chromium/quic_stream_factory_test.cc

Issue 2958133002: Change QuicStreamRequest::Request() to take a preferred QuicVersion so that (Closed)
Patch Set: Re #26 Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/quic/chromium/quic_stream_factory.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/chromium/quic_stream_factory_test.cc
diff --git a/net/quic/chromium/quic_stream_factory_test.cc b/net/quic/chromium/quic_stream_factory_test.cc
index d97c7ce302b74965b162bccc097d47178fc17f91..d9f1d773d90d1a450f69973b0bdb513c7b13e189 100644
--- a/net/quic/chromium/quic_stream_factory_test.cc
+++ b/net/quic/chromium/quic_stream_factory_test.cc
@@ -216,8 +216,8 @@ class QuicStreamFactoryTestBase {
&transport_security_state_, cert_transparency_verifier_.get(),
/*SocketPerformanceWatcherFactory*/ nullptr,
&crypto_client_stream_factory_, &random_generator_, &clock_,
- kDefaultMaxPacketSize, string(), SupportedVersions(version_),
- store_server_configs_in_properties_, close_sessions_on_ip_change_,
+ kDefaultMaxPacketSize, string(), store_server_configs_in_properties_,
+ close_sessions_on_ip_change_,
/*mark_quic_broken_when_network_blackholes*/ false,
idle_connection_timeout_seconds_, reduced_ping_timeout_seconds_,
packet_reader_yield_after_duration_milliseconds_,
@@ -285,7 +285,7 @@ class QuicStreamFactoryTestBase {
QuicStreamRequest request(factory_.get());
GURL url("https://" + destination.host() + "/");
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(destination, privacy_mode_,
+ request.Request(destination, version_, privacy_mode_,
/*cert_verify_flags=*/0, url, "GET", net_log_,
callback_.callback()));
@@ -430,7 +430,7 @@ class QuicStreamFactoryTestBase {
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
@@ -610,9 +610,9 @@ class QuicStreamFactoryTestBase {
QuicStreamRequest request(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(quic_server_id.host_port_pair(), privacy_mode_,
- /*cert_verify_flags=*/0, url_, "GET", net_log_,
- callback_.callback()));
+ request.Request(quic_server_id.host_port_pair(), version_,
+ privacy_mode_, /*cert_verify_flags=*/0, url_,
+ "GET", net_log_, callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
EXPECT_FALSE(QuicStreamFactoryPeer::CryptoConfigCacheIsEmpty(
@@ -643,10 +643,10 @@ class QuicStreamFactoryTestBase {
QuicStreamRequest request2(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request2.Request(quic_server_id2.host_port_pair(), privacy_mode_,
- /*cert_verify_flags=*/0,
- GURL("https://mail.example.org/"), "GET",
- net_log_, callback_.callback()));
+ request2.Request(
+ quic_server_id2.host_port_pair(), version_, privacy_mode_,
+ /*cert_verify_flags=*/0, GURL("https://mail.example.org/"),
+ "GET", net_log_, callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
EXPECT_FALSE(QuicStreamFactoryPeer::CryptoConfigCacheIsEmpty(
@@ -760,7 +760,7 @@ TEST_P(QuicStreamFactoryTest, Create) {
QuicStreamRequest request(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
@@ -769,7 +769,7 @@ TEST_P(QuicStreamFactoryTest, Create) {
EXPECT_TRUE(stream.get());
QuicStreamRequest request2(factory_.get());
- EXPECT_EQ(OK, request2.Request(host_port_pair_, privacy_mode_,
+ EXPECT_EQ(OK, request2.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
// Will reset stream 3.
@@ -780,7 +780,7 @@ TEST_P(QuicStreamFactoryTest, Create) {
// TODO(rtenneti): We should probably have a tests that HTTP and HTTPS result
// in streams on different sessions.
QuicStreamRequest request3(factory_.get());
- EXPECT_EQ(OK, request3.Request(host_port_pair_, privacy_mode_,
+ EXPECT_EQ(OK, request3.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
stream = request3.CreateStream(); // Will reset stream 5.
@@ -806,7 +806,7 @@ TEST_P(QuicStreamFactoryTest, CreateZeroRtt) {
"192.168.0.1", "");
QuicStreamRequest request(factory_.get());
- EXPECT_EQ(OK, request.Request(host_port_pair_, privacy_mode_,
+ EXPECT_EQ(OK, request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
@@ -832,7 +832,7 @@ TEST_P(QuicStreamFactoryTest, CreateZeroRttPost) {
"192.168.0.1", "");
QuicStreamRequest request(factory_.get());
- EXPECT_EQ(OK, request.Request(host_port_pair_, privacy_mode_,
+ EXPECT_EQ(OK, request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "POST", net_log_,
callback_.callback()));
@@ -854,7 +854,7 @@ TEST_P(QuicStreamFactoryTest, DefaultInitialRtt) {
QuicStreamRequest request(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
@@ -885,7 +885,7 @@ TEST_P(QuicStreamFactoryTest, CachedInitialRtt) {
QuicStreamRequest request(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
@@ -916,7 +916,7 @@ TEST_P(QuicStreamFactoryTest, 2gInitialRtt) {
QuicStreamRequest request(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
@@ -947,7 +947,7 @@ TEST_P(QuicStreamFactoryTest, 3gInitialRtt) {
QuicStreamRequest request(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
@@ -973,7 +973,7 @@ TEST_P(QuicStreamFactoryTest, GoAway) {
QuicStreamRequest request(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
@@ -1003,7 +1003,7 @@ TEST_P(QuicStreamFactoryTest, GoAwayForConnectionMigrationWithPortOnly) {
QuicStreamRequest request(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
@@ -1047,7 +1047,7 @@ TEST_P(QuicStreamFactoryTest, Pooling) {
host_resolver_.rules()->AddIPLiteralRule(server2.host(), "192.168.0.1", "");
QuicStreamRequest request(factory_.get());
- EXPECT_EQ(OK, request.Request(host_port_pair_, privacy_mode_,
+ EXPECT_EQ(OK, request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
std::unique_ptr<HttpStream> stream = request.CreateStream();
@@ -1055,7 +1055,7 @@ TEST_P(QuicStreamFactoryTest, Pooling) {
TestCompletionCallback callback;
QuicStreamRequest request2(factory_.get());
- EXPECT_EQ(OK, request2.Request(server2, privacy_mode_,
+ EXPECT_EQ(OK, request2.Request(server2, version_, privacy_mode_,
/*cert_verify_flags=*/0, url2_, "GET",
net_log_, callback.callback()));
std::unique_ptr<HttpStream> stream2 = request2.CreateStream();
@@ -1105,7 +1105,7 @@ TEST_P(QuicStreamFactoryTest, PoolingWithServerMigration) {
TestCompletionCallback callback;
QuicStreamRequest request2(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request2.Request(server2, privacy_mode_,
+ request2.Request(server2, version_, privacy_mode_,
/*cert_verify_flags=*/0, url2_, "GET", net_log_,
callback.callback()));
EXPECT_EQ(OK, callback.WaitForResult());
@@ -1139,7 +1139,7 @@ TEST_P(QuicStreamFactoryTest, NoPoolingAfterGoAway) {
host_resolver_.rules()->AddIPLiteralRule(server2.host(), "192.168.0.1", "");
QuicStreamRequest request(factory_.get());
- EXPECT_EQ(OK, request.Request(host_port_pair_, privacy_mode_,
+ EXPECT_EQ(OK, request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
std::unique_ptr<HttpStream> stream = request.CreateStream();
@@ -1147,7 +1147,7 @@ TEST_P(QuicStreamFactoryTest, NoPoolingAfterGoAway) {
TestCompletionCallback callback;
QuicStreamRequest request2(factory_.get());
- EXPECT_EQ(OK, request2.Request(server2, privacy_mode_,
+ EXPECT_EQ(OK, request2.Request(server2, version_, privacy_mode_,
/*cert_verify_flags=*/0, url2_, "GET",
net_log_, callback.callback()));
std::unique_ptr<HttpStream> stream2 = request2.CreateStream();
@@ -1159,7 +1159,7 @@ TEST_P(QuicStreamFactoryTest, NoPoolingAfterGoAway) {
TestCompletionCallback callback3;
QuicStreamRequest request3(factory_.get());
- EXPECT_EQ(OK, request3.Request(server2, privacy_mode_,
+ EXPECT_EQ(OK, request3.Request(server2, version_, privacy_mode_,
/*cert_verify_flags=*/0, url2_, "GET",
net_log_, callback3.callback()));
std::unique_ptr<HttpStream> stream3 = request3.CreateStream();
@@ -1192,7 +1192,7 @@ TEST_P(QuicStreamFactoryTest, HttpsPooling) {
host_resolver_.rules()->AddIPLiteralRule(server2.host(), "192.168.0.1", "");
QuicStreamRequest request(factory_.get());
- EXPECT_EQ(OK, request.Request(server1, privacy_mode_,
+ EXPECT_EQ(OK, request.Request(server1, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
std::unique_ptr<HttpStream> stream = request.CreateStream();
@@ -1200,7 +1200,7 @@ TEST_P(QuicStreamFactoryTest, HttpsPooling) {
TestCompletionCallback callback;
QuicStreamRequest request2(factory_.get());
- EXPECT_EQ(OK, request2.Request(server2, privacy_mode_,
+ EXPECT_EQ(OK, request2.Request(server2, version_, privacy_mode_,
/*cert_verify_flags=*/0, url2_, "GET",
net_log_, callback_.callback()));
std::unique_ptr<HttpStream> stream2 = request2.CreateStream();
@@ -1236,7 +1236,7 @@ TEST_P(QuicStreamFactoryTest, HttpsPoolingWithMatchingPins) {
host_resolver_.rules()->AddIPLiteralRule(server2.host(), "192.168.0.1", "");
QuicStreamRequest request(factory_.get());
- EXPECT_EQ(OK, request.Request(server1, privacy_mode_,
+ EXPECT_EQ(OK, request.Request(server1, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
std::unique_ptr<HttpStream> stream = request.CreateStream();
@@ -1244,7 +1244,7 @@ TEST_P(QuicStreamFactoryTest, HttpsPoolingWithMatchingPins) {
TestCompletionCallback callback;
QuicStreamRequest request2(factory_.get());
- EXPECT_EQ(OK, request2.Request(server2, privacy_mode_,
+ EXPECT_EQ(OK, request2.Request(server2, version_, privacy_mode_,
/*cert_verify_flags=*/0, url2_, "GET",
net_log_, callback_.callback()));
std::unique_ptr<HttpStream> stream2 = request2.CreateStream();
@@ -1291,7 +1291,7 @@ TEST_P(QuicStreamFactoryTest, NoHttpsPoolingWithDifferentPins) {
host_resolver_.rules()->AddIPLiteralRule(server2.host(), "192.168.0.1", "");
QuicStreamRequest request(factory_.get());
- EXPECT_EQ(OK, request.Request(server1, privacy_mode_,
+ EXPECT_EQ(OK, request.Request(server1, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
std::unique_ptr<HttpStream> stream = request.CreateStream();
@@ -1299,7 +1299,7 @@ TEST_P(QuicStreamFactoryTest, NoHttpsPoolingWithDifferentPins) {
TestCompletionCallback callback;
QuicStreamRequest request2(factory_.get());
- EXPECT_EQ(OK, request2.Request(server2, privacy_mode_,
+ EXPECT_EQ(OK, request2.Request(server2, version_, privacy_mode_,
/*cert_verify_flags=*/0, url2_, "GET",
net_log_, callback_.callback()));
std::unique_ptr<HttpStream> stream2 = request2.CreateStream();
@@ -1330,7 +1330,7 @@ TEST_P(QuicStreamFactoryTest, Goaway) {
QuicStreamRequest request(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
@@ -1350,7 +1350,7 @@ TEST_P(QuicStreamFactoryTest, Goaway) {
// new session is created.
QuicStreamRequest request2(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request2.Request(host_port_pair_, privacy_mode_,
+ request2.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
@@ -1392,7 +1392,7 @@ TEST_P(QuicStreamFactoryTest, MaxOpenStream) {
// kDefaultMaxStreamsPerConnection / 2.
for (size_t i = 0; i < kDefaultMaxStreamsPerConnection / 2; i++) {
QuicStreamRequest request(factory_.get());
- int rv = request.Request(host_port_pair_, privacy_mode_,
+ int rv = request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback());
if (i == 0) {
@@ -1409,7 +1409,7 @@ TEST_P(QuicStreamFactoryTest, MaxOpenStream) {
}
QuicStreamRequest request(factory_.get());
- EXPECT_EQ(OK, request.Request(host_port_pair_, privacy_mode_,
+ EXPECT_EQ(OK, request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
CompletionCallback()));
std::unique_ptr<HttpStream> stream = request.CreateStream();
@@ -1444,7 +1444,7 @@ TEST_P(QuicStreamFactoryTest, ResolutionErrorInCreate) {
QuicStreamRequest request(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
@@ -1463,7 +1463,7 @@ TEST_P(QuicStreamFactoryTest, ConnectErrorInCreate) {
QuicStreamRequest request(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
@@ -1482,7 +1482,7 @@ TEST_P(QuicStreamFactoryTest, CancelCreate) {
{
QuicStreamRequest request(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
}
@@ -1490,7 +1490,7 @@ TEST_P(QuicStreamFactoryTest, CancelCreate) {
base::RunLoop().RunUntilIdle();
QuicStreamRequest request2(factory_.get());
- EXPECT_EQ(OK, request2.Request(host_port_pair_, privacy_mode_,
+ EXPECT_EQ(OK, request2.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
std::unique_ptr<HttpStream> stream = request2.CreateStream();
@@ -1521,7 +1521,7 @@ TEST_P(QuicStreamFactoryTest, CloseAllSessions) {
QuicStreamRequest request(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
@@ -1541,7 +1541,7 @@ TEST_P(QuicStreamFactoryTest, CloseAllSessions) {
QuicStreamRequest request2(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request2.Request(host_port_pair_, privacy_mode_,
+ request2.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
@@ -1575,7 +1575,7 @@ TEST_P(QuicStreamFactoryTest,
// Create request, should fail after the write of the CHLO fails.
QuicStreamRequest request(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_EQ(ERR_QUIC_HANDSHAKE_FAILED, callback_.WaitForResult());
@@ -1594,7 +1594,7 @@ TEST_P(QuicStreamFactoryTest,
QuicStreamRequest request2(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request2.Request(host_port_pair_, privacy_mode_,
+ request2.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_FALSE(HasActiveSession(host_port_pair_));
@@ -1637,7 +1637,7 @@ TEST_P(QuicStreamFactoryTest, WriteErrorInCryptoConnectWithSyncHostResolution) {
// Create request, should fail immediately.
QuicStreamRequest request(factory_.get());
EXPECT_EQ(ERR_QUIC_HANDSHAKE_FAILED,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
// Check no active session, or active jobs left for this server.
@@ -1656,7 +1656,7 @@ TEST_P(QuicStreamFactoryTest, WriteErrorInCryptoConnectWithSyncHostResolution) {
QuicStreamRequest request2(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request2.Request(host_port_pair_, privacy_mode_,
+ request2.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_FALSE(HasActiveSession(host_port_pair_));
@@ -1699,7 +1699,7 @@ TEST_P(QuicStreamFactoryTest, OnIPAddressChanged) {
QuicStreamRequest request(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
@@ -1720,7 +1720,7 @@ TEST_P(QuicStreamFactoryTest, OnIPAddressChanged) {
QuicStreamRequest request2(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request2.Request(host_port_pair_, privacy_mode_,
+ request2.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
@@ -1767,7 +1767,7 @@ void QuicStreamFactoryTestBase::OnNetworkMadeDefault(bool async_write_before) {
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
@@ -1834,7 +1834,7 @@ void QuicStreamFactoryTestBase::OnNetworkMadeDefault(bool async_write_before) {
QuicStreamRequest request2(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request2.Request(host_port_pair_, privacy_mode_,
+ request2.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
@@ -1897,7 +1897,7 @@ void QuicStreamFactoryTestBase::OnNetworkDisconnected(bool async_write_before) {
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
@@ -1959,7 +1959,7 @@ void QuicStreamFactoryTestBase::OnNetworkDisconnected(bool async_write_before) {
QuicStreamRequest request2(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request2.Request(host_port_pair_, privacy_mode_,
+ request2.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
@@ -2007,7 +2007,7 @@ void QuicStreamFactoryTestBase::OnNetworkDisconnectedWithNetworkList(
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
@@ -2065,7 +2065,7 @@ TEST_P(QuicStreamFactoryTest, OnNetworkMadeDefaultNonMigratableStream) {
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
@@ -2114,7 +2114,7 @@ TEST_P(QuicStreamFactoryTest, OnNetworkMadeDefaultConnectionMigrationDisabled) {
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
@@ -2166,7 +2166,7 @@ TEST_P(QuicStreamFactoryTest, OnNetworkDisconnectedNonMigratableStream) {
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
@@ -2214,7 +2214,7 @@ TEST_P(QuicStreamFactoryTest,
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
@@ -2262,7 +2262,7 @@ TEST_P(QuicStreamFactoryTest, OnNetworkMadeDefaultNoOpenStreams) {
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
@@ -2300,7 +2300,7 @@ TEST_P(QuicStreamFactoryTest, OnNetworkDisconnectedNoOpenStreams) {
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
@@ -2342,7 +2342,7 @@ TEST_P(QuicStreamFactoryTest, OnNetworkChangeDisconnectedPauseBeforeConnected) {
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
@@ -2418,7 +2418,7 @@ TEST_P(QuicStreamFactoryTest, OnNetworkChangeDisconnectedPauseBeforeConnected) {
socket_data2.AddSocketDataToFactory(&socket_factory_);
QuicStreamRequest request2(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request2.Request(host_port_pair_, privacy_mode_,
+ request2.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
@@ -2466,7 +2466,7 @@ TEST_P(QuicStreamFactoryTest,
// Create request and QuicHttpStream to create session1.
QuicStreamRequest request1(factory_.get());
- EXPECT_EQ(OK, request1.Request(server1, privacy_mode_,
+ EXPECT_EQ(OK, request1.Request(server1, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
std::unique_ptr<HttpStream> stream1 = request1.CreateStream();
@@ -2474,7 +2474,7 @@ TEST_P(QuicStreamFactoryTest,
// Create request and QuicHttpStream to create session2.
QuicStreamRequest request2(factory_.get());
- EXPECT_EQ(OK, request2.Request(server2, privacy_mode_,
+ EXPECT_EQ(OK, request2.Request(server2, version_, privacy_mode_,
/*cert_verify_flags=*/0, url2_, "GET",
net_log_, callback_.callback()));
std::unique_ptr<HttpStream> stream2 = request2.CreateStream();
@@ -2559,7 +2559,7 @@ TEST_P(QuicStreamFactoryTest, MigrateSessionEarly) {
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
@@ -2623,7 +2623,7 @@ TEST_P(QuicStreamFactoryTest, MigrateSessionEarly) {
QuicStreamRequest request2(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request2.Request(host_port_pair_, privacy_mode_,
+ request2.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
@@ -2684,7 +2684,7 @@ TEST_P(QuicStreamFactoryTest, MigrateSessionEarlyWithAsyncWrites) {
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
@@ -2750,7 +2750,7 @@ TEST_P(QuicStreamFactoryTest, MigrateSessionEarlyWithAsyncWrites) {
QuicStreamRequest request2(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request2.Request(host_port_pair_, privacy_mode_,
+ request2.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
@@ -2803,7 +2803,7 @@ TEST_P(QuicStreamFactoryTest, MigrateSessionEarlyNoNewNetwork) {
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
@@ -2855,7 +2855,7 @@ TEST_P(QuicStreamFactoryTest, MigrateSessionEarlyNonMigratableStream) {
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
@@ -2907,7 +2907,7 @@ TEST_P(QuicStreamFactoryTest, MigrateSessionEarlyConnectionMigrationDisabled) {
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
@@ -2965,7 +2965,7 @@ void QuicStreamFactoryTestBase::TestMigrationOnWriteError(
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
@@ -3054,7 +3054,7 @@ void QuicStreamFactoryTestBase::TestMigrationOnWriteErrorNoNewNetwork(
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
@@ -3143,7 +3143,7 @@ void QuicStreamFactoryTestBase::TestMigrationOnWriteErrorNonMigratableStream(
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
@@ -3207,7 +3207,7 @@ void QuicStreamFactoryTestBase::TestMigrationOnWriteErrorMigrationDisabled(
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
@@ -3286,7 +3286,7 @@ void QuicStreamFactoryTestBase::TestMigrationOnMultipleWriteErrors(
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
@@ -3366,7 +3366,7 @@ void QuicStreamFactoryTestBase::TestMigrationOnWriteErrorWithNotificationQueued(
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
@@ -3464,7 +3464,7 @@ void QuicStreamFactoryTestBase::TestMigrationOnNotificationWithWriteErrorQueued(
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
@@ -3563,7 +3563,7 @@ void QuicStreamFactoryTestBase::TestMigrationOnWriteErrorPauseBeforeConnected(
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
@@ -3644,7 +3644,7 @@ void QuicStreamFactoryTestBase::TestMigrationOnWriteErrorPauseBeforeConnected(
QuicStreamRequest request2(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request2.Request(host_port_pair_, privacy_mode_,
+ request2.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
@@ -3696,7 +3696,7 @@ void QuicStreamFactoryTestBase::
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
@@ -3785,7 +3785,7 @@ void QuicStreamFactoryTestBase::
QuicStreamRequest request2(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request2.Request(host_port_pair_, privacy_mode_,
+ request2.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
@@ -3850,7 +3850,7 @@ TEST_P(QuicStreamFactoryTest, MigrateSessionEarlyToBadSocket) {
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
@@ -3913,7 +3913,7 @@ TEST_P(QuicStreamFactoryTest, ServerMigration) {
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
@@ -4055,7 +4055,7 @@ TEST_P(QuicStreamFactoryTest, ServerMigrationIPv4ToIPv6Fails) {
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
@@ -4109,7 +4109,7 @@ TEST_P(QuicStreamFactoryTest, OnSSLConfigChanged) {
QuicStreamRequest request(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
@@ -4129,7 +4129,7 @@ TEST_P(QuicStreamFactoryTest, OnSSLConfigChanged) {
QuicStreamRequest request2(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request2.Request(host_port_pair_, privacy_mode_,
+ request2.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
@@ -4162,7 +4162,7 @@ TEST_P(QuicStreamFactoryTest, OnCertDBChanged) {
QuicStreamRequest request(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
@@ -4183,7 +4183,7 @@ TEST_P(QuicStreamFactoryTest, OnCertDBChanged) {
QuicStreamRequest request2(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request2.Request(host_port_pair_, privacy_mode_,
+ request2.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
@@ -4287,7 +4287,7 @@ TEST_P(QuicStreamFactoryTest, EnableNotLoadFromDiskCache) {
"192.168.0.1", "");
QuicStreamRequest request(factory_.get());
- EXPECT_EQ(OK, request.Request(host_port_pair_, privacy_mode_,
+ EXPECT_EQ(OK, request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
@@ -4334,7 +4334,7 @@ TEST_P(QuicStreamFactoryTest, ReducePingTimeoutOnConnectionTimeOutOpenStreams) {
EXPECT_EQ(QuicTime::Delta::FromSeconds(kPingTimeoutSecs),
QuicStreamFactoryPeer::GetPingTimeout(factory_.get()));
QuicStreamRequest request(factory_.get());
- EXPECT_EQ(OK, request.Request(host_port_pair_, privacy_mode_,
+ EXPECT_EQ(OK, request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
@@ -4366,7 +4366,7 @@ TEST_P(QuicStreamFactoryTest, ReducePingTimeoutOnConnectionTimeOutOpenStreams) {
DVLOG(1) << "Create 2nd session and timeout with open stream";
TestCompletionCallback callback2;
QuicStreamRequest request2(factory_.get());
- EXPECT_EQ(OK, request2.Request(server2, privacy_mode_,
+ EXPECT_EQ(OK, request2.Request(server2, version_, privacy_mode_,
/*cert_verify_flags=*/0, url2_, "GET",
net_log_, callback2.callback()));
QuicChromiumClientSession* session2 = GetActiveSession(server2);
@@ -4432,7 +4432,7 @@ TEST_P(QuicStreamFactoryTest, StartCertVerifyJob) {
// Start a QUIC request.
QuicStreamRequest request(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
@@ -4477,7 +4477,7 @@ TEST_P(QuicStreamFactoryTest, YieldAfterPackets) {
"StartReading");
QuicStreamRequest request(factory_.get());
- EXPECT_EQ(OK, request.Request(host_port_pair_, privacy_mode_,
+ EXPECT_EQ(OK, request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
@@ -4522,7 +4522,7 @@ TEST_P(QuicStreamFactoryTest, YieldAfterDuration) {
"StartReading");
QuicStreamRequest request(factory_.get());
- EXPECT_EQ(OK, request.Request(host_port_pair_, privacy_mode_,
+ EXPECT_EQ(OK, request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
@@ -4554,7 +4554,7 @@ TEST_P(QuicStreamFactoryTest, ServerPushSessionAffinity) {
QuicStreamRequest request(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
@@ -4574,7 +4574,7 @@ TEST_P(QuicStreamFactoryTest, ServerPushSessionAffinity) {
->promised_by_url())[kDefaultUrl] = &promised;
QuicStreamRequest request2(factory_.get());
- EXPECT_EQ(OK, request2.Request(host_port_pair_, privacy_mode_,
+ EXPECT_EQ(OK, request2.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
@@ -4601,7 +4601,7 @@ TEST_P(QuicStreamFactoryTest, ServerPushPrivacyModeMismatch) {
QuicStreamRequest request(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
@@ -4627,7 +4627,7 @@ TEST_P(QuicStreamFactoryTest, ServerPushPrivacyModeMismatch) {
// cancel it because the privacy modes do not match.
QuicStreamRequest request2(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request2.Request(host_port_pair_, PRIVACY_MODE_ENABLED,
+ request2.Request(host_port_pair_, version_, PRIVACY_MODE_ENABLED,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
@@ -4662,7 +4662,7 @@ TEST_P(QuicStreamFactoryTest, PoolByOrigin) {
QuicStreamRequest request1(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request1.Request(destination1, privacy_mode_,
+ request1.Request(destination1, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
@@ -4673,7 +4673,7 @@ TEST_P(QuicStreamFactoryTest, PoolByOrigin) {
// Second request returns synchronously because it pools to existing session.
TestCompletionCallback callback2;
QuicStreamRequest request2(factory_.get());
- EXPECT_EQ(OK, request2.Request(destination2, privacy_mode_,
+ EXPECT_EQ(OK, request2.Request(destination2, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback2.callback()));
std::unique_ptr<HttpStream> stream2 = request2.CreateStream();
@@ -4705,7 +4705,7 @@ TEST_P(QuicStreamFactoryTest, ForceHolBlockingEnabled) {
QuicStreamRequest request(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, version_, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
@@ -4801,9 +4801,10 @@ TEST_P(QuicStreamFactoryWithDestinationTest, InvalidCertificate) {
AddHangingSocketData();
QuicStreamRequest request(factory_.get());
- EXPECT_EQ(ERR_IO_PENDING, request.Request(destination, privacy_mode_,
- /*cert_verify_flags=*/0, url, "GET",
- net_log_, callback_.callback()));
+ EXPECT_EQ(ERR_IO_PENDING,
+ request.Request(destination, version_, privacy_mode_,
+ /*cert_verify_flags=*/0, url, "GET", net_log_,
+ callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsError(ERR_QUIC_HANDSHAKE_FAILED));
@@ -4844,7 +4845,7 @@ TEST_P(QuicStreamFactoryWithDestinationTest, SharedCertificate) {
QuicStreamRequest request1(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request1.Request(destination, privacy_mode_,
+ request1.Request(destination, version_, privacy_mode_,
/*cert_verify_flags=*/0, url1, "GET", net_log_,
callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
@@ -4856,7 +4857,7 @@ TEST_P(QuicStreamFactoryWithDestinationTest, SharedCertificate) {
// Second request returns synchronously because it pools to existing session.
TestCompletionCallback callback2;
QuicStreamRequest request2(factory_.get());
- EXPECT_EQ(OK, request2.Request(destination, privacy_mode_,
+ EXPECT_EQ(OK, request2.Request(destination, version_, privacy_mode_,
/*cert_verify_flags=*/0, url2, "GET", net_log_,
callback2.callback()));
std::unique_ptr<HttpStream> stream2 = request2.CreateStream();
@@ -4916,7 +4917,7 @@ TEST_P(QuicStreamFactoryWithDestinationTest, DifferentPrivacyMode) {
QuicStreamRequest request1(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request1.Request(destination, PRIVACY_MODE_DISABLED,
+ request1.Request(destination, version_, PRIVACY_MODE_DISABLED,
/*cert_verify_flags=*/0, url1, "GET", net_log_,
callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
@@ -4927,7 +4928,7 @@ TEST_P(QuicStreamFactoryWithDestinationTest, DifferentPrivacyMode) {
TestCompletionCallback callback2;
QuicStreamRequest request2(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request2.Request(destination, PRIVACY_MODE_ENABLED,
+ request2.Request(destination, version_, PRIVACY_MODE_ENABLED,
/*cert_verify_flags=*/0, url2, "GET", net_log_,
callback2.callback()));
EXPECT_EQ(OK, callback2.WaitForResult());
@@ -4999,7 +5000,7 @@ TEST_P(QuicStreamFactoryWithDestinationTest, DisjointCertificate) {
QuicStreamRequest request1(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request1.Request(destination, privacy_mode_,
+ request1.Request(destination, version_, privacy_mode_,
/*cert_verify_flags=*/0, url1, "GET", net_log_,
callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
@@ -5010,7 +5011,7 @@ TEST_P(QuicStreamFactoryWithDestinationTest, DisjointCertificate) {
TestCompletionCallback callback2;
QuicStreamRequest request2(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request2.Request(destination, privacy_mode_,
+ request2.Request(destination, version_, privacy_mode_,
/*cert_verify_flags=*/0, url2, "GET", net_log_,
callback2.callback()));
EXPECT_THAT(callback2.WaitForResult(), IsOk());
« no previous file with comments | « net/quic/chromium/quic_stream_factory.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698