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

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

Issue 2901093004: Add and persist a new field in AlternativeServiceInfo to list QUIC verisons advertised (Closed)
Patch Set: self review 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
Index: net/quic/chromium/quic_network_transaction_unittest.cc
diff --git a/net/quic/chromium/quic_network_transaction_unittest.cc b/net/quic/chromium/quic_network_transaction_unittest.cc
index 9ffa06c507ed460c07832e88c7a0ba245138c29b..fde5ce35e4b90903533f1698848e2db155300f17 100644
--- a/net/quic/chromium/quic_network_transaction_unittest.cc
+++ b/net/quic/chromium/quic_network_transaction_unittest.cc
@@ -607,8 +607,9 @@ class QuicNetworkTransactionTest
url::SchemeHostPort server(request_.url);
AlternativeService alternative_service(kProtoQUIC, server.host(), 443);
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);
}
void AddQuicRemoteAlternativeServiceMapping(
@@ -619,8 +620,9 @@ class QuicNetworkTransactionTest
AlternativeService alternative_service(kProtoQUIC, alternative.host(),
alternative.port());
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);
}
void ExpectBrokenAlternateProtocolMapping() {
@@ -1075,8 +1077,9 @@ TEST_P(QuicNetworkTransactionTest, RetryMisdirectedRequest) {
AlternativeService alternative_service(kProtoQUIC, kDefaultServerHostName,
443);
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 try: The alternative job uses QUIC and reports an HTTP 421
// Misdirected Request error. The main job uses TCP, but |http_data| below is
@@ -2674,16 +2677,18 @@ TEST_P(QuicNetworkTransactionTest, PoolByOrigin) {
url::SchemeHostPort server(request_.url);
AlternativeService alternative_service(kProtoQUIC, destination1, 443);
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 request opens connection to |destination1|
// with QuicServerId.host() == kDefaultServerHostName.
SendRequestAndExpectQuicResponse("hello!");
// Set up alternative service entry to a different destination.
alternative_service = AlternativeService(kProtoQUIC, destination2, 443);
- http_server_properties_.SetAlternativeService(server, alternative_service,
- expiration);
+ http_server_properties_.SetAlternativeService(
+ server, alternative_service, expiration,
+ HttpNetworkSession::Params().quic_supported_versions);
// Second request pools to existing connection with same QuicServerId,
// even though alternative service destination is different.
SendRequestAndExpectQuicResponse("hello!");
@@ -2747,7 +2752,8 @@ TEST_P(QuicNetworkTransactionTest, PoolByDestination) {
AlternativeService alternative_service1(kProtoQUIC, destination1, 443);
base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1);
http_server_properties_.SetAlternativeService(
- url::SchemeHostPort(origin1), alternative_service1, expiration);
+ url::SchemeHostPort(origin1), alternative_service1, expiration,
+ HttpNetworkSession::Params().quic_supported_versions);
// Set up multiple alternative service entries for |origin2|,
// the first one with a different destination as for |origin1|,
@@ -2755,10 +2761,12 @@ TEST_P(QuicNetworkTransactionTest, PoolByDestination) {
// because the request can be pooled to that one.
AlternativeService alternative_service2(kProtoQUIC, destination2, 443);
AlternativeServiceInfoVector alternative_services;
- alternative_services.push_back(
- AlternativeServiceInfo(alternative_service2, expiration));
- alternative_services.push_back(
- AlternativeServiceInfo(alternative_service1, expiration));
+ alternative_services.push_back(AlternativeServiceInfo(
+ alternative_service2, expiration,
+ HttpNetworkSession::Params().quic_supported_versions));
+ alternative_services.push_back(AlternativeServiceInfo(
+ alternative_service1, expiration,
+ HttpNetworkSession::Params().quic_supported_versions));
http_server_properties_.SetAlternativeServices(url::SchemeHostPort(origin2),
alternative_services);
// First request opens connection to |destination1|
@@ -4261,7 +4269,7 @@ class QuicNetworkTransactionWithDestinationTest
base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1);
http_server_properties_.SetAlternativeService(
url::SchemeHostPort("https", origin, 443), alternative_service,
- expiration);
+ expiration, HttpNetworkSession::Params().quic_supported_versions);
}
std::unique_ptr<QuicEncryptedPacket> ConstructClientRequestHeadersPacket(

Powered by Google App Engine
This is Rietveld 408576698