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 5e6833c22552c73d89120dead4e68a5585e5bd04..b44bf3b5004c9932ac00b566a5f9106bd4d154b0 100644 |
--- a/net/http/http_network_transaction_unittest.cc |
+++ b/net/http/http_network_transaction_unittest.cc |
@@ -8809,8 +8809,7 @@ scoped_ptr<HttpNetworkSession> SetupSessionForGroupNameTests( |
AlternateProtocolFromNextProto(next_proto), "", 443); |
base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1); |
http_server_properties->SetAlternativeService( |
- HostPortPair("host.with.alternate", 80), alternative_service, 1.0, |
- expiration); |
+ HostPortPair("host.with.alternate", 80), alternative_service, expiration); |
return session; |
} |
@@ -9737,8 +9736,8 @@ TEST_P(HttpNetworkTransactionTest, ClearAlternativeServices) { |
HostPortPair http_host_port_pair("www.example.org", 80); |
AlternativeService alternative_service(QUIC, "", 80); |
base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1); |
- http_server_properties.SetAlternativeService( |
- http_host_port_pair, alternative_service, 1.0, expiration); |
+ http_server_properties.SetAlternativeService(http_host_port_pair, |
+ alternative_service, expiration); |
AlternativeServiceVector alternative_service_vector = |
http_server_properties.GetAlternativeServices(http_host_port_pair); |
EXPECT_EQ(1u, alternative_service_vector.size()); |
@@ -9999,8 +9998,8 @@ TEST_P(HttpNetworkTransactionTest, EmptyAlternateProtocolHeader) { |
*session->http_server_properties(); |
AlternativeService alternative_service(QUIC, "", 80); |
base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1); |
- http_server_properties.SetAlternativeService( |
- http_host_port_pair, alternative_service, 1.0, expiration); |
+ http_server_properties.SetAlternativeService(http_host_port_pair, |
+ alternative_service, expiration); |
AlternativeServiceVector alternative_service_vector = |
http_server_properties.GetAlternativeServices(http_host_port_pair); |
@@ -10130,7 +10129,7 @@ TEST_P(HttpNetworkTransactionTest, DisableAlternativeServiceToDifferentHost) { |
80); |
base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1); |
http_server_properties->SetAlternativeService( |
- HostPortPair::FromURL(request.url), alternative_service, 1.0, expiration); |
+ HostPortPair::FromURL(request.url), alternative_service, expiration); |
scoped_ptr<HttpTransaction> trans( |
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
@@ -10184,7 +10183,7 @@ TEST_P(HttpNetworkTransactionTest, IdentifyQuicBroken) { |
AlternativeService alternative_service(QUIC, alternative); |
base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1); |
http_server_properties->SetAlternativeService(origin, alternative_service, |
- 1.0, expiration); |
+ expiration); |
// Mark the QUIC alternative service as broken. |
http_server_properties->MarkAlternativeServiceBroken(alternative_service); |
@@ -10248,11 +10247,11 @@ TEST_P(HttpNetworkTransactionTest, IdentifyQuicNotBroken) { |
base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1); |
AlternativeService alternative_service1(QUIC, alternative1); |
- AlternativeServiceInfo alternative_service_info1(alternative_service1, 1.0, |
+ AlternativeServiceInfo alternative_service_info1(alternative_service1, |
expiration); |
alternative_service_info_vector.push_back(alternative_service_info1); |
AlternativeService alternative_service2(QUIC, alternative2); |
- AlternativeServiceInfo alternative_service_info2(alternative_service2, 1.0, |
+ AlternativeServiceInfo alternative_service_info2(alternative_service2, |
expiration); |
alternative_service_info_vector.push_back(alternative_service_info2); |
@@ -10316,7 +10315,7 @@ TEST_P(HttpNetworkTransactionTest, |
666); // Port is ignored by MockConnect anyway. |
base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1); |
http_server_properties->SetAlternativeService( |
- host_port_pair, alternative_service, 1.0, expiration); |
+ host_port_pair, alternative_service, expiration); |
scoped_ptr<HttpTransaction> trans( |
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
@@ -10382,7 +10381,7 @@ TEST_P(HttpNetworkTransactionTest, |
base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1); |
http_server_properties->SetAlternativeService( |
HostPortPair::FromURL(restricted_port_request.url), alternative_service, |
- 1.0, expiration); |
+ expiration); |
scoped_ptr<HttpTransaction> trans( |
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
@@ -10435,7 +10434,7 @@ TEST_P(HttpNetworkTransactionTest, |
base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1); |
http_server_properties->SetAlternativeService( |
HostPortPair::FromURL(restricted_port_request.url), alternative_service, |
- 1.0, expiration); |
+ expiration); |
scoped_ptr<HttpTransaction> trans( |
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
@@ -10487,7 +10486,7 @@ TEST_P(HttpNetworkTransactionTest, |
base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1); |
http_server_properties->SetAlternativeService( |
HostPortPair::FromURL(restricted_port_request.url), alternative_service, |
- 1.0, expiration); |
+ expiration); |
scoped_ptr<HttpTransaction> trans( |
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
@@ -10540,7 +10539,7 @@ TEST_P(HttpNetworkTransactionTest, |
base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1); |
http_server_properties->SetAlternativeService( |
HostPortPair::FromURL(unrestricted_port_request.url), alternative_service, |
- 1.0, expiration); |
+ expiration); |
scoped_ptr<HttpTransaction> trans( |
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
@@ -10592,7 +10591,7 @@ TEST_P(HttpNetworkTransactionTest, |
base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1); |
http_server_properties->SetAlternativeService( |
HostPortPair::FromURL(unrestricted_port_request.url), alternative_service, |
- 1.0, expiration); |
+ expiration); |
scoped_ptr<HttpTransaction> trans( |
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
@@ -10638,7 +10637,7 @@ TEST_P(HttpNetworkTransactionTest, AlternateProtocolUnsafeBlocked) { |
kUnsafePort); |
base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1); |
http_server_properties->SetAlternativeService( |
- HostPortPair::FromURL(request.url), alternative_service, 1.0, expiration); |
+ HostPortPair::FromURL(request.url), alternative_service, expiration); |
scoped_ptr<HttpTransaction> trans( |
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
@@ -13364,7 +13363,7 @@ class AltSvcCertificateVerificationTest : public HttpNetworkTransactionTest { |
AlternateProtocolFromNextProto(GetProtocol()), alternative); |
base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1); |
http_server_properties->SetAlternativeService(origin, alternative_service, |
- 1.0, expiration); |
+ expiration); |
// First request to alternative. |
if (pooling) { |
@@ -13469,7 +13468,7 @@ TEST_P(HttpNetworkTransactionTest, AlternativeServiceNotOnHttp11) { |
AlternateProtocolFromNextProto(GetProtocol()), alternative); |
base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1); |
http_server_properties->SetAlternativeService(origin, alternative_service, |
- 1.0, expiration); |
+ expiration); |
scoped_ptr<HttpTransaction> trans( |
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
@@ -13543,7 +13542,7 @@ TEST_P(HttpNetworkTransactionTest, FailedAlternativeServiceIsNotUserVisible) { |
AlternateProtocolFromNextProto(GetProtocol()), alternative); |
base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1); |
http_server_properties->SetAlternativeService(origin, alternative_service, |
- 1.0, expiration); |
+ expiration); |
HttpNetworkTransaction trans1(DEFAULT_PRIORITY, session.get()); |
HttpRequestInfo request1; |
@@ -13653,7 +13652,7 @@ TEST_P(HttpNetworkTransactionTest, AlternativeServiceShouldNotPoolToHttp11) { |
AlternateProtocolFromNextProto(GetProtocol()), alternative); |
base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1); |
http_server_properties->SetAlternativeService(origin, alternative_service, |
- 1.0, expiration); |
+ expiration); |
// First transaction to alternative to open an HTTP/1.1 socket. |
scoped_ptr<HttpTransaction> trans1( |