Index: net/http/http_network_transaction_unittest.cc |
diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc |
index b5eff6c900604bd59c7b2fbdcc890d0e435b1091..52b644504e309ae89fd42d9eaf5aa92cef60bfd3 100644 |
--- a/net/http/http_network_transaction_unittest.cc |
+++ b/net/http/http_network_transaction_unittest.cc |
@@ -9240,7 +9240,7 @@ std::unique_ptr<HttpNetworkSession> SetupSessionForGroupNameTests( |
base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1); |
http_server_properties->SetAlternativeService( |
url::SchemeHostPort("https", "host.with.alternate", 443), |
- alternative_service, expiration); |
+ alternative_service, expiration, QuicVersionVector()); |
return session; |
} |
@@ -10198,7 +10198,8 @@ TEST_F(HttpNetworkTransactionTest, |
444); |
base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1); |
http_server_properties->SetAlternativeService( |
- url::SchemeHostPort(request.url), alternative_service, expiration); |
+ url::SchemeHostPort(request.url), alternative_service, expiration, |
+ QuicVersionVector()); |
HttpNetworkTransaction trans(DEFAULT_PRIORITY, session.get()); |
TestCompletionCallback callback; |
@@ -10237,7 +10238,8 @@ TEST_F(HttpNetworkTransactionTest, |
AlternativeService alternative_service(kProtoHTTP2, "", 444); |
base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1); |
http_server_properties->SetAlternativeService( |
- url::SchemeHostPort(request.url), alternative_service, expiration); |
+ url::SchemeHostPort(request.url), alternative_service, expiration, |
+ QuicVersionVector()); |
HttpNetworkTransaction trans(DEFAULT_PRIORITY, session.get()); |
TestCompletionCallback callback; |
@@ -10256,7 +10258,8 @@ TEST_F(HttpNetworkTransactionTest, ClearAlternativeServices) { |
AlternativeService alternative_service(kProtoQUIC, "", 80); |
base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1); |
http_server_properties->SetAlternativeService( |
- test_server, alternative_service, expiration); |
+ test_server, alternative_service, expiration, |
+ session->params().quic_supported_versions); |
EXPECT_EQ( |
1u, |
http_server_properties->GetAlternativeServiceInfos(test_server).size()); |
@@ -10398,8 +10401,9 @@ TEST_F(HttpNetworkTransactionTest, IdentifyQuicBroken) { |
session->http_server_properties(); |
AlternativeService alternative_service(kProtoQUIC, alternative); |
base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1); |
- http_server_properties->SetAlternativeService(server, alternative_service, |
- expiration); |
+ http_server_properties->SetAlternativeService( |
+ server, alternative_service, expiration, |
+ HttpNetworkSession::Params().quic_supported_versions); |
// Mark the QUIC alternative service as broken. |
http_server_properties->MarkAlternativeServiceBroken(alternative_service); |
@@ -10521,8 +10525,8 @@ TEST_F(HttpNetworkTransactionTest, MarkBrokenAlternateProtocolAndFallback) { |
kProtoHTTP2, "www.example.org", |
666); // Port is ignored by MockConnect anyway. |
base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1); |
- http_server_properties->SetAlternativeService(server, alternative_service, |
- expiration); |
+ http_server_properties->SetAlternativeService( |
+ server, alternative_service, expiration, QuicVersionVector()); |
HttpNetworkTransaction trans(DEFAULT_PRIORITY, session.get()); |
TestCompletionCallback callback; |
@@ -10586,7 +10590,7 @@ TEST_F(HttpNetworkTransactionTest, AlternateProtocolPortRestrictedBlocked) { |
base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1); |
http_server_properties->SetAlternativeService( |
url::SchemeHostPort(restricted_port_request.url), alternative_service, |
- expiration); |
+ expiration, QuicVersionVector()); |
HttpNetworkTransaction trans(DEFAULT_PRIORITY, session.get()); |
TestCompletionCallback callback; |
@@ -10636,7 +10640,7 @@ TEST_F(HttpNetworkTransactionTest, AlternateProtocolPortRestrictedPermitted) { |
base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1); |
http_server_properties->SetAlternativeService( |
url::SchemeHostPort(restricted_port_request.url), alternative_service, |
- expiration); |
+ expiration, QuicVersionVector()); |
HttpNetworkTransaction trans(DEFAULT_PRIORITY, session.get()); |
TestCompletionCallback callback; |
@@ -10685,7 +10689,7 @@ TEST_F(HttpNetworkTransactionTest, AlternateProtocolPortRestrictedAllowed) { |
base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1); |
http_server_properties->SetAlternativeService( |
url::SchemeHostPort(restricted_port_request.url), alternative_service, |
- expiration); |
+ expiration, QuicVersionVector()); |
HttpNetworkTransaction trans(DEFAULT_PRIORITY, session.get()); |
TestCompletionCallback callback; |
@@ -10734,7 +10738,7 @@ TEST_F(HttpNetworkTransactionTest, AlternateProtocolPortUnrestrictedAllowed1) { |
base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1); |
http_server_properties->SetAlternativeService( |
url::SchemeHostPort(unrestricted_port_request.url), alternative_service, |
- expiration); |
+ expiration, QuicVersionVector()); |
HttpNetworkTransaction trans(DEFAULT_PRIORITY, session.get()); |
TestCompletionCallback callback; |
@@ -10783,7 +10787,7 @@ TEST_F(HttpNetworkTransactionTest, AlternateProtocolPortUnrestrictedAllowed2) { |
base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1); |
http_server_properties->SetAlternativeService( |
url::SchemeHostPort(unrestricted_port_request.url), alternative_service, |
- expiration); |
+ expiration, QuicVersionVector()); |
HttpNetworkTransaction trans(DEFAULT_PRIORITY, session.get()); |
TestCompletionCallback callback; |
@@ -10823,7 +10827,8 @@ TEST_F(HttpNetworkTransactionTest, AlternateProtocolUnsafeBlocked) { |
kUnsafePort); |
base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1); |
http_server_properties->SetAlternativeService( |
- url::SchemeHostPort(request.url), alternative_service, expiration); |
+ url::SchemeHostPort(request.url), alternative_service, expiration, |
+ QuicVersionVector()); |
HttpNetworkTransaction trans(DEFAULT_PRIORITY, session.get()); |
TestCompletionCallback callback; |
@@ -11182,8 +11187,8 @@ TEST_F(HttpNetworkTransactionTest, UseOriginNotAlternativeForProxy) { |
HostPortPair alternative("www.example.com", 443); |
AlternativeService alternative_service(kProtoHTTP2, alternative); |
base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1); |
- http_server_properties->SetAlternativeService(server, alternative_service, |
- expiration); |
+ http_server_properties->SetAlternativeService( |
+ server, alternative_service, expiration, QuicVersionVector()); |
// Non-alternative job should hang. |
MockConnect never_finishing_connect(SYNCHRONOUS, ERR_IO_PENDING); |
@@ -14066,8 +14071,8 @@ TEST_F(HttpNetworkTransactionTest, AlternativeServiceNotOnHttp11) { |
session->http_server_properties(); |
AlternativeService alternative_service(kProtoHTTP2, alternative); |
base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1); |
- http_server_properties->SetAlternativeService(server, alternative_service, |
- expiration); |
+ http_server_properties->SetAlternativeService( |
+ server, alternative_service, expiration, QuicVersionVector()); |
HttpRequestInfo request; |
HttpNetworkTransaction trans(DEFAULT_PRIORITY, session.get()); |
@@ -14133,8 +14138,8 @@ TEST_F(HttpNetworkTransactionTest, FailedAlternativeServiceIsNotUserVisible) { |
session->http_server_properties(); |
AlternativeService alternative_service(kProtoHTTP2, alternative); |
base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1); |
- http_server_properties->SetAlternativeService(server, alternative_service, |
- expiration); |
+ http_server_properties->SetAlternativeService( |
+ server, alternative_service, expiration, QuicVersionVector()); |
HttpNetworkTransaction trans1(DEFAULT_PRIORITY, session.get()); |
HttpRequestInfo request1; |
@@ -14240,8 +14245,8 @@ TEST_F(HttpNetworkTransactionTest, AlternativeServiceShouldNotPoolToHttp11) { |
session->http_server_properties(); |
AlternativeService alternative_service(kProtoHTTP2, alternative); |
base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1); |
- http_server_properties->SetAlternativeService(server, alternative_service, |
- expiration); |
+ http_server_properties->SetAlternativeService( |
+ server, alternative_service, expiration, QuicVersionVector()); |
// First transaction to alternative to open an HTTP/1.1 socket. |
HttpRequestInfo request1; |