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 754bd99a08032149e6ab676df42e4884d75377c2..c53cf2374d508f0565ce6488e0be6bc807adbf7c 100644 |
--- a/net/http/http_network_transaction_unittest.cc |
+++ b/net/http/http_network_transaction_unittest.cc |
@@ -9231,7 +9231,8 @@ 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, |
+ HttpNetworkSession::Params().quic_supported_versions); |
return session; |
} |
@@ -10194,7 +10195,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, |
+ HttpNetworkSession::Params().quic_supported_versions); |
HttpNetworkTransaction trans(DEFAULT_PRIORITY, session.get()); |
TestCompletionCallback callback; |
@@ -10233,7 +10235,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, |
+ HttpNetworkSession::Params().quic_supported_versions); |
HttpNetworkTransaction trans(DEFAULT_PRIORITY, session.get()); |
TestCompletionCallback callback; |
@@ -10252,7 +10255,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, |
+ HttpNetworkSession::Params().quic_supported_versions); |
EXPECT_EQ( |
1u, |
http_server_properties->GetAlternativeServiceInfos(test_server).size()); |
@@ -10394,8 +10398,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); |
@@ -10455,12 +10460,14 @@ TEST_F(HttpNetworkTransactionTest, IdentifyQuicNotBroken) { |
base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1); |
AlternativeService alternative_service1(kProtoQUIC, alternative1); |
- AlternativeServiceInfo alternative_service_info1(alternative_service1, |
- expiration); |
+ AlternativeServiceInfo alternative_service_info1( |
+ alternative_service1, expiration, |
+ HttpNetworkSession::Params().quic_supported_versions); |
alternative_service_info_vector.push_back(alternative_service_info1); |
AlternativeService alternative_service2(kProtoQUIC, alternative2); |
- AlternativeServiceInfo alternative_service_info2(alternative_service2, |
- expiration); |
+ AlternativeServiceInfo alternative_service_info2( |
+ alternative_service2, expiration, |
+ HttpNetworkSession::Params().quic_supported_versions); |
alternative_service_info_vector.push_back(alternative_service_info2); |
http_server_properties->SetAlternativeServices( |
@@ -10517,8 +10524,9 @@ 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, |
+ HttpNetworkSession::Params().quic_supported_versions); |
HttpNetworkTransaction trans(DEFAULT_PRIORITY, session.get()); |
TestCompletionCallback callback; |
@@ -10582,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, HttpNetworkSession::Params().quic_supported_versions); |
HttpNetworkTransaction trans(DEFAULT_PRIORITY, session.get()); |
TestCompletionCallback callback; |
@@ -10632,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, HttpNetworkSession::Params().quic_supported_versions); |
HttpNetworkTransaction trans(DEFAULT_PRIORITY, session.get()); |
TestCompletionCallback callback; |
@@ -10681,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, HttpNetworkSession::Params().quic_supported_versions); |
HttpNetworkTransaction trans(DEFAULT_PRIORITY, session.get()); |
TestCompletionCallback callback; |
@@ -10730,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, HttpNetworkSession::Params().quic_supported_versions); |
HttpNetworkTransaction trans(DEFAULT_PRIORITY, session.get()); |
TestCompletionCallback callback; |
@@ -10779,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, HttpNetworkSession::Params().quic_supported_versions); |
HttpNetworkTransaction trans(DEFAULT_PRIORITY, session.get()); |
TestCompletionCallback callback; |
@@ -10819,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, |
+ HttpNetworkSession::Params().quic_supported_versions); |
HttpNetworkTransaction trans(DEFAULT_PRIORITY, session.get()); |
TestCompletionCallback callback; |
@@ -11176,8 +11185,9 @@ 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, |
+ HttpNetworkSession::Params().quic_supported_versions); |
// Non-alternative job should hang. |
MockConnect never_finishing_connect(SYNCHRONOUS, ERR_IO_PENDING); |
@@ -14079,8 +14089,9 @@ 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, |
+ HttpNetworkSession::Params().quic_supported_versions); |
HttpRequestInfo request; |
HttpNetworkTransaction trans(DEFAULT_PRIORITY, session.get()); |
@@ -14146,8 +14157,9 @@ 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, |
+ HttpNetworkSession::Params().quic_supported_versions); |
HttpNetworkTransaction trans1(DEFAULT_PRIORITY, session.get()); |
HttpRequestInfo request1; |
@@ -14253,8 +14265,9 @@ 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, |
+ HttpNetworkSession::Params().quic_supported_versions); |
// First transaction to alternative to open an HTTP/1.1 socket. |
HttpRequestInfo request1; |