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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2894303002: Change HttpStreamFactoryImpl::Job to take a AlternativeServiceInfo
Patch Set: Change QuicStreamFactory::CreateSession() to take a QUIC version. Created 3 years, 7 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 f427bf256fdf703fddfd3d6eec82947e8480f94b..70cf9ff8f2605674ea1f176ddbf8dfb125b2a92c 100644
--- a/net/quic/chromium/quic_stream_factory_test.cc
+++ b/net/quic/chromium/quic_stream_factory_test.cc
@@ -283,9 +283,11 @@ class QuicStreamFactoryTestBase {
socket_data.AddSocketDataToFactory(&socket_factory_);
QuicStreamRequest request(factory_.get());
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
GURL url("https://" + destination.host() + "/");
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(destination, privacy_mode_,
+ request.Request(destination, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url, "GET", net_log_,
callback_.callback()));
@@ -428,10 +430,13 @@ class QuicStreamFactoryTestBase {
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
- EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
- /*cert_verify_flags=*/0, url_, "GET", net_log_,
- callback_.callback()));
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
+ EXPECT_EQ(
+ ERR_IO_PENDING,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
+ /*cert_verify_flags=*/0, url_, "GET", net_log_,
+ callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
// Run QuicChromiumClientSession::WriteToNewSocket()
@@ -606,8 +611,12 @@ class QuicStreamFactoryTestBase {
socket_data.AddSocketDataToFactory(&socket_factory_);
QuicStreamRequest request(factory_.get());
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
+
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(quic_server_id.host_port_pair(), privacy_mode_,
+ request.Request(quic_server_id.host_port_pair(),
+ advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
@@ -640,7 +649,8 @@ class QuicStreamFactoryTestBase {
QuicStreamRequest request2(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request2.Request(quic_server_id2.host_port_pair(), privacy_mode_,
+ request2.Request(quic_server_id2.host_port_pair(),
+ advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0,
GURL("https://mail.example.org/"), "GET",
net_log_, callback_.callback()));
@@ -756,8 +766,11 @@ TEST_P(QuicStreamFactoryTest, Create) {
socket_data.AddSocketDataToFactory(&socket_factory_);
QuicStreamRequest request(factory_.get());
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
+
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
@@ -766,9 +779,10 @@ TEST_P(QuicStreamFactoryTest, Create) {
EXPECT_TRUE(stream.get());
QuicStreamRequest request2(factory_.get());
- EXPECT_EQ(OK, request2.Request(host_port_pair_, privacy_mode_,
- /*cert_verify_flags=*/0, url_, "GET", net_log_,
- callback_.callback()));
+ EXPECT_EQ(
+ OK, request2.Request(host_port_pair_, advertised_versions, privacy_mode_,
+ /*cert_verify_flags=*/0, url_, "GET", net_log_,
+ callback_.callback()));
// Will reset stream 3.
stream = request2.CreateStream();
@@ -777,9 +791,10 @@ 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_,
- /*cert_verify_flags=*/0, url_, "GET", net_log_,
- callback_.callback()));
+ EXPECT_EQ(
+ OK, request3.Request(host_port_pair_, advertised_versions, privacy_mode_,
+ /*cert_verify_flags=*/0, url_, "GET", net_log_,
+ callback_.callback()));
stream = request3.CreateStream(); // Will reset stream 5.
stream.reset(); // Will reset stream 7.
@@ -803,9 +818,13 @@ TEST_P(QuicStreamFactoryTest, CreateZeroRtt) {
"192.168.0.1", "");
QuicStreamRequest request(factory_.get());
- EXPECT_EQ(OK, request.Request(host_port_pair_, privacy_mode_,
- /*cert_verify_flags=*/0, url_, "GET", net_log_,
- callback_.callback()));
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
+
+ EXPECT_EQ(OK,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
+ /*cert_verify_flags=*/0, url_, "GET", net_log_,
+ callback_.callback()));
std::unique_ptr<HttpStream> stream = request.CreateStream();
EXPECT_TRUE(stream.get());
@@ -829,9 +848,13 @@ TEST_P(QuicStreamFactoryTest, CreateZeroRttPost) {
"192.168.0.1", "");
QuicStreamRequest request(factory_.get());
- EXPECT_EQ(OK, request.Request(host_port_pair_, privacy_mode_,
- /*cert_verify_flags=*/0, url_, "POST", net_log_,
- callback_.callback()));
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
+
+ EXPECT_EQ(OK,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
+ /*cert_verify_flags=*/0, url_, "POST", net_log_,
+ callback_.callback()));
std::unique_ptr<HttpStream> stream = request.CreateStream();
EXPECT_TRUE(stream.get());
@@ -850,8 +873,11 @@ TEST_P(QuicStreamFactoryTest, DefaultInitialRtt) {
socket_data.AddSocketDataToFactory(&socket_factory_);
QuicStreamRequest request(factory_.get());
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
+
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
@@ -881,8 +907,11 @@ TEST_P(QuicStreamFactoryTest, CachedInitialRtt) {
socket_data.AddSocketDataToFactory(&socket_factory_);
QuicStreamRequest request(factory_.get());
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
+
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
@@ -912,8 +941,11 @@ TEST_P(QuicStreamFactoryTest, 2gInitialRtt) {
socket_data.AddSocketDataToFactory(&socket_factory_);
QuicStreamRequest request(factory_.get());
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
+
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
@@ -943,8 +975,11 @@ TEST_P(QuicStreamFactoryTest, 3gInitialRtt) {
socket_data.AddSocketDataToFactory(&socket_factory_);
QuicStreamRequest request(factory_.get());
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
+
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
@@ -969,8 +1004,11 @@ TEST_P(QuicStreamFactoryTest, GoAway) {
socket_data.AddSocketDataToFactory(&socket_factory_);
QuicStreamRequest request(factory_.get());
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
+
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
@@ -999,8 +1037,11 @@ TEST_P(QuicStreamFactoryTest, GoAwayForConnectionMigrationWithPortOnly) {
socket_data.AddSocketDataToFactory(&socket_factory_);
QuicStreamRequest request(factory_.get());
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
+
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
@@ -1044,15 +1085,19 @@ 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_,
- /*cert_verify_flags=*/0, url_, "GET", net_log_,
- callback_.callback()));
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
+
+ EXPECT_EQ(OK,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
+ /*cert_verify_flags=*/0, url_, "GET", net_log_,
+ callback_.callback()));
std::unique_ptr<HttpStream> stream = request.CreateStream();
EXPECT_TRUE(stream.get());
TestCompletionCallback callback;
QuicStreamRequest request2(factory_.get());
- EXPECT_EQ(OK, request2.Request(server2, privacy_mode_,
+ EXPECT_EQ(OK, request2.Request(server2, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url2_, "GET",
net_log_, callback.callback()));
std::unique_ptr<HttpStream> stream2 = request2.CreateStream();
@@ -1101,8 +1146,11 @@ TEST_P(QuicStreamFactoryTest, PoolingWithServerMigration) {
// Create new request to cause new session creation.
TestCompletionCallback callback;
QuicStreamRequest request2(factory_.get());
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
+
EXPECT_EQ(ERR_IO_PENDING,
- request2.Request(server2, privacy_mode_,
+ request2.Request(server2, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url2_, "GET", net_log_,
callback.callback()));
EXPECT_EQ(OK, callback.WaitForResult());
@@ -1136,15 +1184,19 @@ 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_,
- /*cert_verify_flags=*/0, url_, "GET", net_log_,
- callback_.callback()));
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
+
+ EXPECT_EQ(OK,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
+ /*cert_verify_flags=*/0, url_, "GET", net_log_,
+ callback_.callback()));
std::unique_ptr<HttpStream> stream = request.CreateStream();
EXPECT_TRUE(stream.get());
TestCompletionCallback callback;
QuicStreamRequest request2(factory_.get());
- EXPECT_EQ(OK, request2.Request(server2, privacy_mode_,
+ EXPECT_EQ(OK, request2.Request(server2, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url2_, "GET",
net_log_, callback.callback()));
std::unique_ptr<HttpStream> stream2 = request2.CreateStream();
@@ -1156,7 +1208,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, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url2_, "GET",
net_log_, callback3.callback()));
std::unique_ptr<HttpStream> stream3 = request3.CreateStream();
@@ -1189,7 +1241,10 @@ 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_,
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
+
+ EXPECT_EQ(OK, request.Request(server1, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
std::unique_ptr<HttpStream> stream = request.CreateStream();
@@ -1197,7 +1252,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, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url2_, "GET",
net_log_, callback_.callback()));
std::unique_ptr<HttpStream> stream2 = request2.CreateStream();
@@ -1233,7 +1288,9 @@ 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_,
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
+ EXPECT_EQ(OK, request.Request(server1, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
std::unique_ptr<HttpStream> stream = request.CreateStream();
@@ -1241,7 +1298,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, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url2_, "GET",
net_log_, callback_.callback()));
std::unique_ptr<HttpStream> stream2 = request2.CreateStream();
@@ -1288,7 +1345,9 @@ 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_,
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
+ EXPECT_EQ(OK, request.Request(server1, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
std::unique_ptr<HttpStream> stream = request.CreateStream();
@@ -1296,7 +1355,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, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url2_, "GET",
net_log_, callback_.callback()));
std::unique_ptr<HttpStream> stream2 = request2.CreateStream();
@@ -1326,8 +1385,10 @@ TEST_P(QuicStreamFactoryTest, Goaway) {
socket_data2.AddSocketDataToFactory(&socket_factory_);
QuicStreamRequest request(factory_.get());
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
@@ -1346,10 +1407,11 @@ TEST_P(QuicStreamFactoryTest, Goaway) {
// Create a new request for the same destination and verify that a
// new session is created.
QuicStreamRequest request2(factory_.get());
- EXPECT_EQ(ERR_IO_PENDING,
- request2.Request(host_port_pair_, privacy_mode_,
- /*cert_verify_flags=*/0, url_, "GET", net_log_,
- callback_.callback()));
+ EXPECT_EQ(
+ ERR_IO_PENDING,
+ request2.Request(host_port_pair_, advertised_versions, privacy_mode_,
+ /*cert_verify_flags=*/0, url_, "GET", net_log_,
+ callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
std::unique_ptr<HttpStream> stream2 = request2.CreateStream();
EXPECT_TRUE(stream2.get());
@@ -1385,13 +1447,15 @@ TEST_P(QuicStreamFactoryTest, MaxOpenStream) {
HttpRequestInfo request_info;
std::vector<std::unique_ptr<HttpStream>> streams;
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
// The MockCryptoClientStream sets max_open_streams to be
// kDefaultMaxStreamsPerConnection / 2.
for (size_t i = 0; i < kDefaultMaxStreamsPerConnection / 2; i++) {
QuicStreamRequest request(factory_.get());
- int rv = request.Request(host_port_pair_, privacy_mode_,
- /*cert_verify_flags=*/0, url_, "GET", net_log_,
- callback_.callback());
+ int rv = request.Request(
+ host_port_pair_, advertised_versions, privacy_mode_,
+ /*cert_verify_flags=*/0, url_, "GET", net_log_, callback_.callback());
if (i == 0) {
EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
@@ -1406,9 +1470,10 @@ TEST_P(QuicStreamFactoryTest, MaxOpenStream) {
}
QuicStreamRequest request(factory_.get());
- EXPECT_EQ(OK, request.Request(host_port_pair_, privacy_mode_,
- /*cert_verify_flags=*/0, url_, "GET", net_log_,
- CompletionCallback()));
+ EXPECT_EQ(OK,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
+ /*cert_verify_flags=*/0, url_, "GET", net_log_,
+ CompletionCallback()));
std::unique_ptr<HttpStream> stream = request.CreateStream();
EXPECT_TRUE(stream);
EXPECT_EQ(ERR_IO_PENDING,
@@ -1440,8 +1505,10 @@ TEST_P(QuicStreamFactoryTest, ResolutionErrorInCreate) {
host_resolver_.rules()->AddSimulatedFailure(kDefaultServerHostName);
QuicStreamRequest request(factory_.get());
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
@@ -1459,8 +1526,10 @@ TEST_P(QuicStreamFactoryTest, ConnectErrorInCreate) {
socket_data.AddSocketDataToFactory(&socket_factory_);
QuicStreamRequest request(factory_.get());
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
@@ -1476,20 +1545,24 @@ TEST_P(QuicStreamFactoryTest, CancelCreate) {
socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
socket_data.AddWrite(ConstructInitialSettingsPacket());
socket_data.AddSocketDataToFactory(&socket_factory_);
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
{
QuicStreamRequest request(factory_.get());
- EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
- /*cert_verify_flags=*/0, url_, "GET", net_log_,
- callback_.callback()));
+ EXPECT_EQ(
+ ERR_IO_PENDING,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
+ /*cert_verify_flags=*/0, url_, "GET", net_log_,
+ callback_.callback()));
}
base::RunLoop().RunUntilIdle();
QuicStreamRequest request2(factory_.get());
- EXPECT_EQ(OK, request2.Request(host_port_pair_, privacy_mode_,
- /*cert_verify_flags=*/0, url_, "GET", net_log_,
- callback_.callback()));
+ EXPECT_EQ(
+ OK, request2.Request(host_port_pair_, advertised_versions, privacy_mode_,
+ /*cert_verify_flags=*/0, url_, "GET", net_log_,
+ callback_.callback()));
std::unique_ptr<HttpStream> stream = request2.CreateStream();
EXPECT_TRUE(stream.get());
@@ -1517,8 +1590,10 @@ TEST_P(QuicStreamFactoryTest, CloseAllSessions) {
socket_data2.AddSocketDataToFactory(&socket_factory_);
QuicStreamRequest request(factory_.get());
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
@@ -1537,10 +1612,11 @@ TEST_P(QuicStreamFactoryTest, CloseAllSessions) {
// a new session.
QuicStreamRequest request2(factory_.get());
- EXPECT_EQ(ERR_IO_PENDING,
- request2.Request(host_port_pair_, privacy_mode_,
- /*cert_verify_flags=*/0, url_, "GET", net_log_,
- callback_.callback()));
+ EXPECT_EQ(
+ ERR_IO_PENDING,
+ request2.Request(host_port_pair_, advertised_versions, privacy_mode_,
+ /*cert_verify_flags=*/0, url_, "GET", net_log_,
+ callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
stream = request2.CreateStream();
@@ -1571,8 +1647,10 @@ TEST_P(QuicStreamFactoryTest,
// Create request, should fail after the write of the CHLO fails.
QuicStreamRequest request(factory_.get());
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_EQ(ERR_QUIC_HANDSHAKE_FAILED, callback_.WaitForResult());
@@ -1590,10 +1668,11 @@ TEST_P(QuicStreamFactoryTest,
socket_data2.AddSocketDataToFactory(&socket_factory_);
QuicStreamRequest request2(factory_.get());
- EXPECT_EQ(ERR_IO_PENDING,
- request2.Request(host_port_pair_, privacy_mode_,
- /*cert_verify_flags=*/0, url_, "GET", net_log_,
- callback_.callback()));
+ EXPECT_EQ(
+ ERR_IO_PENDING,
+ request2.Request(host_port_pair_, advertised_versions, privacy_mode_,
+ /*cert_verify_flags=*/0, url_, "GET", net_log_,
+ callback_.callback()));
EXPECT_FALSE(HasActiveSession(host_port_pair_));
EXPECT_TRUE(HasActiveJob(host_port_pair_, privacy_mode_));
// Run the message loop to complete host resolution.
@@ -1633,8 +1712,10 @@ TEST_P(QuicStreamFactoryTest, WriteErrorInCryptoConnectWithSyncHostResolution) {
// Create request, should fail immediately.
QuicStreamRequest request(factory_.get());
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
EXPECT_EQ(ERR_QUIC_HANDSHAKE_FAILED,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
// Check no active session, or active jobs left for this server.
@@ -1652,10 +1733,11 @@ TEST_P(QuicStreamFactoryTest, WriteErrorInCryptoConnectWithSyncHostResolution) {
socket_data2.AddSocketDataToFactory(&socket_factory_);
QuicStreamRequest request2(factory_.get());
- EXPECT_EQ(ERR_IO_PENDING,
- request2.Request(host_port_pair_, privacy_mode_,
- /*cert_verify_flags=*/0, url_, "GET", net_log_,
- callback_.callback()));
+ EXPECT_EQ(
+ ERR_IO_PENDING,
+ request2.Request(host_port_pair_, advertised_versions, privacy_mode_,
+ /*cert_verify_flags=*/0, url_, "GET", net_log_,
+ callback_.callback()));
EXPECT_FALSE(HasActiveSession(host_port_pair_));
EXPECT_TRUE(HasActiveJob(host_port_pair_, privacy_mode_));
@@ -1695,8 +1777,10 @@ TEST_P(QuicStreamFactoryTest, OnIPAddressChanged) {
socket_data2.AddSocketDataToFactory(&socket_factory_);
QuicStreamRequest request(factory_.get());
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
@@ -1716,10 +1800,11 @@ TEST_P(QuicStreamFactoryTest, OnIPAddressChanged) {
// a new session.
QuicStreamRequest request2(factory_.get());
- EXPECT_EQ(ERR_IO_PENDING,
- request2.Request(host_port_pair_, privacy_mode_,
- /*cert_verify_flags=*/0, url_, "GET", net_log_,
- callback_.callback()));
+ EXPECT_EQ(
+ ERR_IO_PENDING,
+ request2.Request(host_port_pair_, advertised_versions, privacy_mode_,
+ /*cert_verify_flags=*/0, url_, "GET", net_log_,
+ callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
stream = request2.CreateStream();
@@ -1763,8 +1848,10 @@ void QuicStreamFactoryTestBase::OnNetworkMadeDefault(bool async_write_before) {
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
@@ -1830,10 +1917,11 @@ void QuicStreamFactoryTestBase::OnNetworkMadeDefault(bool async_write_before) {
socket_data2.AddSocketDataToFactory(&socket_factory_);
QuicStreamRequest request2(factory_.get());
- EXPECT_EQ(ERR_IO_PENDING,
- request2.Request(host_port_pair_, privacy_mode_,
- /*cert_verify_flags=*/0, url_, "GET", net_log_,
- callback_.callback()));
+ EXPECT_EQ(
+ ERR_IO_PENDING,
+ request2.Request(host_port_pair_, advertised_versions, privacy_mode_,
+ /*cert_verify_flags=*/0, url_, "GET", net_log_,
+ callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
std::unique_ptr<HttpStream> stream2 = request2.CreateStream();
EXPECT_TRUE(stream2.get());
@@ -1893,8 +1981,10 @@ void QuicStreamFactoryTestBase::OnNetworkDisconnected(bool async_write_before) {
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
@@ -1955,10 +2045,11 @@ void QuicStreamFactoryTestBase::OnNetworkDisconnected(bool async_write_before) {
socket_data2.AddSocketDataToFactory(&socket_factory_);
QuicStreamRequest request2(factory_.get());
- EXPECT_EQ(ERR_IO_PENDING,
- request2.Request(host_port_pair_, privacy_mode_,
- /*cert_verify_flags=*/0, url_, "GET", net_log_,
- callback_.callback()));
+ EXPECT_EQ(
+ ERR_IO_PENDING,
+ request2.Request(host_port_pair_, advertised_versions, privacy_mode_,
+ /*cert_verify_flags=*/0, url_, "GET", net_log_,
+ callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
std::unique_ptr<HttpStream> stream2 = request2.CreateStream();
EXPECT_TRUE(stream2.get());
@@ -2003,8 +2094,10 @@ void QuicStreamFactoryTestBase::OnNetworkDisconnectedWithNetworkList(
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
@@ -2061,8 +2154,10 @@ TEST_P(QuicStreamFactoryTest, OnNetworkMadeDefaultNonMigratableStream) {
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
@@ -2110,8 +2205,10 @@ TEST_P(QuicStreamFactoryTest, OnNetworkMadeDefaultConnectionMigrationDisabled) {
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
@@ -2162,8 +2259,10 @@ TEST_P(QuicStreamFactoryTest, OnNetworkDisconnectedNonMigratableStream) {
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
@@ -2210,8 +2309,10 @@ TEST_P(QuicStreamFactoryTest,
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
@@ -2258,8 +2359,10 @@ TEST_P(QuicStreamFactoryTest, OnNetworkMadeDefaultNoOpenStreams) {
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
@@ -2296,8 +2399,10 @@ TEST_P(QuicStreamFactoryTest, OnNetworkDisconnectedNoOpenStreams) {
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
@@ -2338,8 +2443,10 @@ TEST_P(QuicStreamFactoryTest, OnNetworkChangeDisconnectedPauseBeforeConnected) {
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
@@ -2414,10 +2521,11 @@ TEST_P(QuicStreamFactoryTest, OnNetworkChangeDisconnectedPauseBeforeConnected) {
socket_data2.AddWrite(ConstructInitialSettingsPacket());
socket_data2.AddSocketDataToFactory(&socket_factory_);
QuicStreamRequest request2(factory_.get());
- EXPECT_EQ(ERR_IO_PENDING,
- request2.Request(host_port_pair_, privacy_mode_,
- /*cert_verify_flags=*/0, url_, "GET", net_log_,
- callback_.callback()));
+ EXPECT_EQ(
+ ERR_IO_PENDING,
+ request2.Request(host_port_pair_, advertised_versions, privacy_mode_,
+ /*cert_verify_flags=*/0, url_, "GET", net_log_,
+ callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
std::unique_ptr<HttpStream> stream2 = request2.CreateStream();
EXPECT_TRUE(stream2.get());
@@ -2463,7 +2571,9 @@ TEST_P(QuicStreamFactoryTest,
// Create request and QuicHttpStream to create session1.
QuicStreamRequest request1(factory_.get());
- EXPECT_EQ(OK, request1.Request(server1, privacy_mode_,
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
+ EXPECT_EQ(OK, request1.Request(server1, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
std::unique_ptr<HttpStream> stream1 = request1.CreateStream();
@@ -2471,7 +2581,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, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url2_, "GET",
net_log_, callback_.callback()));
std::unique_ptr<HttpStream> stream2 = request2.CreateStream();
@@ -2555,8 +2665,10 @@ TEST_P(QuicStreamFactoryTest, MigrateSessionEarly) {
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
@@ -2619,10 +2731,11 @@ TEST_P(QuicStreamFactoryTest, MigrateSessionEarly) {
socket_data2.AddSocketDataToFactory(&socket_factory_);
QuicStreamRequest request2(factory_.get());
- EXPECT_EQ(ERR_IO_PENDING,
- request2.Request(host_port_pair_, privacy_mode_,
- /*cert_verify_flags=*/0, url_, "GET", net_log_,
- callback_.callback()));
+ EXPECT_EQ(
+ ERR_IO_PENDING,
+ request2.Request(host_port_pair_, advertised_versions, privacy_mode_,
+ /*cert_verify_flags=*/0, url_, "GET", net_log_,
+ callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
std::unique_ptr<HttpStream> stream2 = request2.CreateStream();
EXPECT_TRUE(stream2.get());
@@ -2680,8 +2793,10 @@ TEST_P(QuicStreamFactoryTest, MigrateSessionEarlyWithAsyncWrites) {
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
@@ -2746,10 +2861,11 @@ TEST_P(QuicStreamFactoryTest, MigrateSessionEarlyWithAsyncWrites) {
socket_data2.AddSocketDataToFactory(&socket_factory_);
QuicStreamRequest request2(factory_.get());
- EXPECT_EQ(ERR_IO_PENDING,
- request2.Request(host_port_pair_, privacy_mode_,
- /*cert_verify_flags=*/0, url_, "GET", net_log_,
- callback_.callback()));
+ EXPECT_EQ(
+ ERR_IO_PENDING,
+ request2.Request(host_port_pair_, advertised_versions, privacy_mode_,
+ /*cert_verify_flags=*/0, url_, "GET", net_log_,
+ callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
std::unique_ptr<HttpStream> stream2 = request2.CreateStream();
EXPECT_TRUE(stream2.get());
@@ -2799,8 +2915,10 @@ TEST_P(QuicStreamFactoryTest, MigrateSessionEarlyNoNewNetwork) {
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
@@ -2851,8 +2969,10 @@ TEST_P(QuicStreamFactoryTest, MigrateSessionEarlyNonMigratableStream) {
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
@@ -2903,8 +3023,10 @@ TEST_P(QuicStreamFactoryTest, MigrateSessionEarlyConnectionMigrationDisabled) {
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
@@ -2961,8 +3083,10 @@ void QuicStreamFactoryTestBase::TestMigrationOnWriteError(
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
@@ -3050,8 +3174,10 @@ void QuicStreamFactoryTestBase::TestMigrationOnWriteErrorNoNewNetwork(
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
@@ -3139,8 +3265,10 @@ void QuicStreamFactoryTestBase::TestMigrationOnWriteErrorNonMigratableStream(
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
@@ -3203,8 +3331,10 @@ void QuicStreamFactoryTestBase::TestMigrationOnWriteErrorMigrationDisabled(
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
@@ -3282,8 +3412,10 @@ void QuicStreamFactoryTestBase::TestMigrationOnMultipleWriteErrors(
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
@@ -3362,8 +3494,10 @@ void QuicStreamFactoryTestBase::TestMigrationOnWriteErrorWithNotificationQueued(
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
@@ -3460,8 +3594,10 @@ void QuicStreamFactoryTestBase::TestMigrationOnNotificationWithWriteErrorQueued(
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
@@ -3559,8 +3695,10 @@ void QuicStreamFactoryTestBase::TestMigrationOnWriteErrorPauseBeforeConnected(
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
@@ -3640,10 +3778,11 @@ void QuicStreamFactoryTestBase::TestMigrationOnWriteErrorPauseBeforeConnected(
socket_data2.AddSocketDataToFactory(&socket_factory_);
QuicStreamRequest request2(factory_.get());
- EXPECT_EQ(ERR_IO_PENDING,
- request2.Request(host_port_pair_, privacy_mode_,
- /*cert_verify_flags=*/0, url_, "GET", net_log_,
- callback_.callback()));
+ EXPECT_EQ(
+ ERR_IO_PENDING,
+ request2.Request(host_port_pair_, advertised_versions, privacy_mode_,
+ /*cert_verify_flags=*/0, url_, "GET", net_log_,
+ callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
std::unique_ptr<HttpStream> stream2 = request2.CreateStream();
EXPECT_TRUE(stream2.get());
@@ -3692,8 +3831,10 @@ void QuicStreamFactoryTestBase::
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
@@ -3781,10 +3922,11 @@ void QuicStreamFactoryTestBase::
socket_data2.AddSocketDataToFactory(&socket_factory_);
QuicStreamRequest request2(factory_.get());
- EXPECT_EQ(ERR_IO_PENDING,
- request2.Request(host_port_pair_, privacy_mode_,
- /*cert_verify_flags=*/0, url_, "GET", net_log_,
- callback_.callback()));
+ EXPECT_EQ(
+ ERR_IO_PENDING,
+ request2.Request(host_port_pair_, advertised_versions, privacy_mode_,
+ /*cert_verify_flags=*/0, url_, "GET", net_log_,
+ callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
std::unique_ptr<HttpStream> stream2 = request2.CreateStream();
EXPECT_TRUE(stream2.get());
@@ -3846,8 +3988,10 @@ TEST_P(QuicStreamFactoryTest, MigrateSessionEarlyToBadSocket) {
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
@@ -3909,8 +4053,10 @@ TEST_P(QuicStreamFactoryTest, ServerMigration) {
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
@@ -4051,8 +4197,10 @@ TEST_P(QuicStreamFactoryTest, ServerMigrationIPv4ToIPv6Fails) {
// Create request and QuicHttpStream.
QuicStreamRequest request(factory_.get());
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
@@ -4105,8 +4253,10 @@ TEST_P(QuicStreamFactoryTest, OnSSLConfigChanged) {
socket_data2.AddSocketDataToFactory(&socket_factory_);
QuicStreamRequest request(factory_.get());
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
@@ -4125,10 +4275,11 @@ TEST_P(QuicStreamFactoryTest, OnSSLConfigChanged) {
// a new session.
QuicStreamRequest request2(factory_.get());
- EXPECT_EQ(ERR_IO_PENDING,
- request2.Request(host_port_pair_, privacy_mode_,
- /*cert_verify_flags=*/0, url_, "GET", net_log_,
- callback_.callback()));
+ EXPECT_EQ(
+ ERR_IO_PENDING,
+ request2.Request(host_port_pair_, advertised_versions, privacy_mode_,
+ /*cert_verify_flags=*/0, url_, "GET", net_log_,
+ callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
stream = request2.CreateStream();
@@ -4158,8 +4309,10 @@ TEST_P(QuicStreamFactoryTest, OnCertDBChanged) {
socket_data2.AddSocketDataToFactory(&socket_factory_);
QuicStreamRequest request(factory_.get());
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
@@ -4179,10 +4332,11 @@ TEST_P(QuicStreamFactoryTest, OnCertDBChanged) {
// a new session.
QuicStreamRequest request2(factory_.get());
- EXPECT_EQ(ERR_IO_PENDING,
- request2.Request(host_port_pair_, privacy_mode_,
- /*cert_verify_flags=*/0, url_, "GET", net_log_,
- callback_.callback()));
+ EXPECT_EQ(
+ ERR_IO_PENDING,
+ request2.Request(host_port_pair_, advertised_versions, privacy_mode_,
+ /*cert_verify_flags=*/0, url_, "GET", net_log_,
+ callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
stream = request2.CreateStream();
@@ -4284,9 +4438,12 @@ TEST_P(QuicStreamFactoryTest, EnableNotLoadFromDiskCache) {
"192.168.0.1", "");
QuicStreamRequest request(factory_.get());
- EXPECT_EQ(OK, request.Request(host_port_pair_, privacy_mode_,
- /*cert_verify_flags=*/0, url_, "GET", net_log_,
- callback_.callback()));
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
+ EXPECT_EQ(OK,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
+ /*cert_verify_flags=*/0, url_, "GET", net_log_,
+ callback_.callback()));
// If we are waiting for disk cache, we would have posted a task. Verify that
// the CancelWaitForDataReady task hasn't been posted.
@@ -4331,9 +4488,12 @@ 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_,
- /*cert_verify_flags=*/0, url_, "GET", net_log_,
- callback_.callback()));
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
+ EXPECT_EQ(OK,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
+ /*cert_verify_flags=*/0, url_, "GET", net_log_,
+ callback_.callback()));
QuicChromiumClientSession* session = GetActiveSession(host_port_pair_);
EXPECT_EQ(QuicTime::Delta::FromSeconds(kPingTimeoutSecs),
@@ -4363,7 +4523,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, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url2_, "GET",
net_log_, callback2.callback()));
QuicChromiumClientSession* session2 = GetActiveSession(server2);
@@ -4428,8 +4588,10 @@ TEST_P(QuicStreamFactoryTest, StartCertVerifyJob) {
// Start a QUIC request.
QuicStreamRequest request(factory_.get());
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
@@ -4474,9 +4636,12 @@ TEST_P(QuicStreamFactoryTest, YieldAfterPackets) {
"StartReading");
QuicStreamRequest request(factory_.get());
- EXPECT_EQ(OK, request.Request(host_port_pair_, privacy_mode_,
- /*cert_verify_flags=*/0, url_, "GET", net_log_,
- callback_.callback()));
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
+ EXPECT_EQ(OK,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
+ /*cert_verify_flags=*/0, url_, "GET", net_log_,
+ callback_.callback()));
// Call run_loop so that QuicChromiumPacketReader::OnReadComplete() gets
// called.
@@ -4519,9 +4684,12 @@ TEST_P(QuicStreamFactoryTest, YieldAfterDuration) {
"StartReading");
QuicStreamRequest request(factory_.get());
- EXPECT_EQ(OK, request.Request(host_port_pair_, privacy_mode_,
- /*cert_verify_flags=*/0, url_, "GET", net_log_,
- callback_.callback()));
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
+ EXPECT_EQ(OK,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
+ /*cert_verify_flags=*/0, url_, "GET", net_log_,
+ callback_.callback()));
// Call run_loop so that QuicChromiumPacketReader::OnReadComplete() gets
// called.
@@ -4550,8 +4718,10 @@ TEST_P(QuicStreamFactoryTest, ServerPushSessionAffinity) {
socket_data.AddSocketDataToFactory(&socket_factory_);
QuicStreamRequest request(factory_.get());
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
@@ -4571,9 +4741,10 @@ TEST_P(QuicStreamFactoryTest, ServerPushSessionAffinity) {
->promised_by_url())[kDefaultUrl] = &promised;
QuicStreamRequest request2(factory_.get());
- EXPECT_EQ(OK, request2.Request(host_port_pair_, privacy_mode_,
- /*cert_verify_flags=*/0, url_, "GET", net_log_,
- callback_.callback()));
+ EXPECT_EQ(
+ OK, request2.Request(host_port_pair_, advertised_versions, privacy_mode_,
+ /*cert_verify_flags=*/0, url_, "GET", net_log_,
+ callback_.callback()));
EXPECT_EQ(1, QuicStreamFactoryPeer::GetNumPushStreamsCreated(factory_.get()));
}
@@ -4597,8 +4768,10 @@ TEST_P(QuicStreamFactoryTest, ServerPushPrivacyModeMismatch) {
socket_data2.AddSocketDataToFactory(&socket_factory_);
QuicStreamRequest request(factory_.get());
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
@@ -4624,7 +4797,8 @@ 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_, advertised_versions,
+ PRIVACY_MODE_ENABLED,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
@@ -4658,8 +4832,10 @@ TEST_P(QuicStreamFactoryTest, PoolByOrigin) {
socket_data.AddSocketDataToFactory(&socket_factory_);
QuicStreamRequest request1(factory_.get());
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
EXPECT_EQ(ERR_IO_PENDING,
- request1.Request(destination1, privacy_mode_,
+ request1.Request(destination1, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
@@ -4670,9 +4846,10 @@ 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_,
- /*cert_verify_flags=*/0, url_, "GET", net_log_,
- callback2.callback()));
+ EXPECT_EQ(OK,
+ request2.Request(destination2, advertised_versions, privacy_mode_,
+ /*cert_verify_flags=*/0, url_, "GET", net_log_,
+ callback2.callback()));
std::unique_ptr<HttpStream> stream2 = request2.CreateStream();
EXPECT_TRUE(stream2.get());
@@ -4701,8 +4878,10 @@ TEST_P(QuicStreamFactoryTest, ForceHolBlockingEnabled) {
socket_data.AddSocketDataToFactory(&socket_factory_);
QuicStreamRequest request(factory_.get());
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
EXPECT_EQ(ERR_IO_PENDING,
- request.Request(host_port_pair_, privacy_mode_,
+ request.Request(host_port_pair_, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url_, "GET", net_log_,
callback_.callback()));
@@ -4798,9 +4977,12 @@ 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()));
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
+ EXPECT_EQ(ERR_IO_PENDING,
+ request.Request(destination, advertised_versions, privacy_mode_,
+ /*cert_verify_flags=*/0, url, "GET", net_log_,
+ callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsError(ERR_QUIC_HANDSHAKE_FAILED));
@@ -4840,8 +5022,10 @@ TEST_P(QuicStreamFactoryWithDestinationTest, SharedCertificate) {
sequenced_socket_data_vector_.push_back(std::move(sequenced_socket_data));
QuicStreamRequest request1(factory_.get());
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
EXPECT_EQ(ERR_IO_PENDING,
- request1.Request(destination, privacy_mode_,
+ request1.Request(destination, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url1, "GET", net_log_,
callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
@@ -4853,9 +5037,10 @@ 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_,
- /*cert_verify_flags=*/0, url2, "GET", net_log_,
- callback2.callback()));
+ EXPECT_EQ(OK,
+ request2.Request(destination, advertised_versions, privacy_mode_,
+ /*cert_verify_flags=*/0, url2, "GET", net_log_,
+ callback2.callback()));
std::unique_ptr<HttpStream> stream2 = request2.CreateStream();
EXPECT_TRUE(stream2.get());
@@ -4912,10 +5097,13 @@ TEST_P(QuicStreamFactoryWithDestinationTest, DifferentPrivacyMode) {
sequenced_socket_data_vector_.push_back(std::move(sequenced_socket_data1));
QuicStreamRequest request1(factory_.get());
- EXPECT_EQ(ERR_IO_PENDING,
- request1.Request(destination, PRIVACY_MODE_DISABLED,
- /*cert_verify_flags=*/0, url1, "GET", net_log_,
- callback_.callback()));
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
+ EXPECT_EQ(
+ ERR_IO_PENDING,
+ request1.Request(destination, advertised_versions, PRIVACY_MODE_DISABLED,
+ /*cert_verify_flags=*/0, url1, "GET", net_log_,
+ callback_.callback()));
EXPECT_EQ(OK, callback_.WaitForResult());
std::unique_ptr<HttpStream> stream1 = request1.CreateStream();
EXPECT_TRUE(stream1.get());
@@ -4923,10 +5111,11 @@ TEST_P(QuicStreamFactoryWithDestinationTest, DifferentPrivacyMode) {
TestCompletionCallback callback2;
QuicStreamRequest request2(factory_.get());
- EXPECT_EQ(ERR_IO_PENDING,
- request2.Request(destination, PRIVACY_MODE_ENABLED,
- /*cert_verify_flags=*/0, url2, "GET", net_log_,
- callback2.callback()));
+ EXPECT_EQ(
+ ERR_IO_PENDING,
+ request2.Request(destination, advertised_versions, PRIVACY_MODE_ENABLED,
+ /*cert_verify_flags=*/0, url2, "GET", net_log_,
+ callback2.callback()));
EXPECT_EQ(OK, callback2.WaitForResult());
std::unique_ptr<HttpStream> stream2 = request2.CreateStream();
EXPECT_TRUE(stream2.get());
@@ -4995,8 +5184,10 @@ TEST_P(QuicStreamFactoryWithDestinationTest, DisjointCertificate) {
sequenced_socket_data_vector_.push_back(std::move(sequenced_socket_data1));
QuicStreamRequest request1(factory_.get());
+ QuicVersionVector advertised_versions;
+ advertised_versions.push_back(version_);
EXPECT_EQ(ERR_IO_PENDING,
- request1.Request(destination, privacy_mode_,
+ request1.Request(destination, advertised_versions, privacy_mode_,
/*cert_verify_flags=*/0, url1, "GET", net_log_,
callback_.callback()));
EXPECT_THAT(callback_.WaitForResult(), IsOk());
@@ -5007,7 +5198,7 @@ TEST_P(QuicStreamFactoryWithDestinationTest, DisjointCertificate) {
TestCompletionCallback callback2;
QuicStreamRequest request2(factory_.get());
EXPECT_EQ(ERR_IO_PENDING,
- request2.Request(destination, privacy_mode_,
+ request2.Request(destination, advertised_versions, 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