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 1e5f418e0b21ee0a665b63c28f9fd47f8fd7a413..b870adac83dce0e24191d57bbe68c2b494061b6e 100644 |
--- a/net/http/http_network_transaction_unittest.cc |
+++ b/net/http/http_network_transaction_unittest.cc |
@@ -9225,7 +9225,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); |
Zhongyi Shi
2017/06/06 22:04:52
Changes introduced in this file are caused by the
|
return session; |
} |
@@ -10183,7 +10184,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; |
@@ -10222,7 +10224,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; |
@@ -10241,7 +10244,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()); |
@@ -10383,8 +10387,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); |
@@ -10506,8 +10511,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; |
@@ -10571,7 +10577,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; |
@@ -10621,7 +10627,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; |
@@ -10670,7 +10676,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; |
@@ -10719,7 +10725,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; |
@@ -10768,7 +10774,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; |
@@ -10808,7 +10814,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; |
@@ -11167,8 +11174,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); |
@@ -14071,8 +14079,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()); |
@@ -14138,8 +14147,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; |
@@ -14245,8 +14255,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; |