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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/http/http_network_transaction_unittest.cc

Issue 2901093004: Add and persist a new field in AlternativeServiceInfo to list QUIC verisons advertised (Closed)
Patch Set: fix compile in components Created 3 years, 6 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
« components/cronet/android/cronet_url_request_context_adapter.cc ('K') | « components/grpc_support/test/get_stream_engine.cc ('k') | net/http/http_server_properties.h » ('j') | net/http/http_server_properties.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 e267038145768a011ca23bbbb9e27dd1109a3e7a..9f34fee45384d97c2fa67190fda054aa9e9e371b 100644
--- a/net/http/http_network_transaction_unittest.cc
+++ b/net/http/http_network_transaction_unittest.cc
@@ -9240,7 +9240,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);
Ryan Hamilton 2017/06/07 20:52:23 Hm, I'm not sure about this. Can we get the params
Zhongyi Shi 2017/06/08 23:11:16 Thanks for catching this. This change was added in
return session;
}
@@ -10198,7 +10199,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;
@@ -10237,7 +10239,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;
@@ -10256,7 +10259,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());
@@ -10398,8 +10402,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 +10526,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;
@@ -10586,7 +10592,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;
@@ -10636,7 +10642,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;
@@ -10685,7 +10691,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;
@@ -10734,7 +10740,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;
@@ -10783,7 +10789,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;
@@ -10823,7 +10829,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;
@@ -11182,8 +11189,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);
@@ -14066,8 +14074,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());
@@ -14133,8 +14142,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;
@@ -14240,8 +14250,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;
« components/cronet/android/cronet_url_request_context_adapter.cc ('K') | « components/grpc_support/test/get_stream_engine.cc ('k') | net/http/http_server_properties.h » ('j') | net/http/http_server_properties.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698