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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/socket/transport_client_socket_pool_unittest.cc

Issue 1580903002: Convert ignore_limits from a SocketParam to a socket request argument. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Missed one Created 4 years, 11 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
« net/socket/client_socket_pool_base_unittest.cc ('K') | « net/socket/transport_client_socket_pool.cc ('k') | net/socket/websocket_transport_client_socket_pool.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/transport_client_socket_pool_unittest.cc
diff --git a/net/socket/transport_client_socket_pool_unittest.cc b/net/socket/transport_client_socket_pool_unittest.cc
index dab0d07639801249daa4b4d321268361024dfb16..94c7ed82d03b30ea51d23ae1dc7888d918f2e738 100644
--- a/net/socket/transport_client_socket_pool_unittest.cc
+++ b/net/socket/transport_client_socket_pool_unittest.cc
@@ -43,7 +43,6 @@ class TransportClientSocketPoolTest : public testing::Test {
new TransportSocketParams(
HostPortPair("www.google.com", 80),
false,
- false,
OnHostResolutionCallback(),
TransportSocketParams::COMBINE_CONNECT_AND_WRITE_DEFAULT)),
host_resolver_(new MockHostResolver),
@@ -61,18 +60,18 @@ class TransportClientSocketPoolTest : public testing::Test {
}
scoped_refptr<TransportSocketParams> CreateParamsForTCPFastOpen() {
- return new TransportSocketParams(HostPortPair("www.google.com", 80),
- false, false, OnHostResolutionCallback(),
- TransportSocketParams::COMBINE_CONNECT_AND_WRITE_DESIRED);
+ return new TransportSocketParams(
+ HostPortPair("www.google.com", 80), false, OnHostResolutionCallback(),
+ TransportSocketParams::COMBINE_CONNECT_AND_WRITE_DESIRED);
}
int StartRequest(const std::string& group_name, RequestPriority priority) {
scoped_refptr<TransportSocketParams> params(new TransportSocketParams(
- HostPortPair("www.google.com", 80), false, false,
- OnHostResolutionCallback(),
+ HostPortPair("www.google.com", 80), false, OnHostResolutionCallback(),
TransportSocketParams::COMBINE_CONNECT_AND_WRITE_DEFAULT));
return test_base_.StartRequestUsingPool(
- &pool_, group_name, priority, params);
+ &pool_, group_name, priority, ClientSocketPool::IgnoreLimits::DISABLED,
+ params);
}
int GetOrderOfRequest(size_t index) {
@@ -178,8 +177,9 @@ TEST(TransportConnectJobTest, MakeAddrListStartWithIPv4) {
TEST_F(TransportClientSocketPoolTest, Basic) {
TestCompletionCallback callback;
ClientSocketHandle handle;
- int rv = handle.Init("a", params_, LOW, callback.callback(), &pool_,
- BoundNetLog());
+ int rv =
+ handle.Init("a", params_, LOW, ClientSocketPool::IgnoreLimits::DISABLED,
+ callback.callback(), &pool_, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_FALSE(handle.is_initialized());
EXPECT_FALSE(handle.socket());
@@ -199,8 +199,9 @@ TEST_F(TransportClientSocketPoolTest, SetResolvePriorityOnInit) {
TestCompletionCallback callback;
ClientSocketHandle handle;
EXPECT_EQ(ERR_IO_PENDING,
- handle.Init("a", params_, priority, callback.callback(), &pool_,
- BoundNetLog()));
+ handle.Init("a", params_, priority,
+ ClientSocketPool::IgnoreLimits::DISABLED,
+ callback.callback(), &pool_, BoundNetLog()));
EXPECT_EQ(priority, host_resolver_->last_request_priority());
}
}
@@ -211,11 +212,12 @@ TEST_F(TransportClientSocketPoolTest, InitHostResolutionFailure) {
ClientSocketHandle handle;
HostPortPair host_port_pair("unresolvable.host.name", 80);
scoped_refptr<TransportSocketParams> dest(new TransportSocketParams(
- host_port_pair, false, false, OnHostResolutionCallback(),
+ host_port_pair, false, OnHostResolutionCallback(),
TransportSocketParams::COMBINE_CONNECT_AND_WRITE_DEFAULT));
EXPECT_EQ(ERR_IO_PENDING,
- handle.Init("a", dest, kDefaultPriority, callback.callback(),
- &pool_, BoundNetLog()));
+ handle.Init("a", dest, kDefaultPriority,
+ ClientSocketPool::IgnoreLimits::DISABLED,
+ callback.callback(), &pool_, BoundNetLog()));
EXPECT_EQ(ERR_NAME_NOT_RESOLVED, callback.WaitForResult());
ASSERT_EQ(1u, handle.connection_attempts().size());
EXPECT_TRUE(handle.connection_attempts()[0].endpoint.address().empty());
@@ -228,8 +230,9 @@ TEST_F(TransportClientSocketPoolTest, InitConnectionFailure) {
TestCompletionCallback callback;
ClientSocketHandle handle;
EXPECT_EQ(ERR_IO_PENDING,
- handle.Init("a", params_, kDefaultPriority, callback.callback(),
- &pool_, BoundNetLog()));
+ handle.Init("a", params_, kDefaultPriority,
+ ClientSocketPool::IgnoreLimits::DISABLED,
+ callback.callback(), &pool_, BoundNetLog()));
EXPECT_EQ(ERR_CONNECTION_FAILED, callback.WaitForResult());
ASSERT_EQ(1u, handle.connection_attempts().size());
EXPECT_EQ("127.0.0.1:80",
@@ -239,8 +242,9 @@ TEST_F(TransportClientSocketPoolTest, InitConnectionFailure) {
// Make the host resolutions complete synchronously this time.
host_resolver_->set_synchronous_mode(true);
EXPECT_EQ(ERR_CONNECTION_FAILED,
- handle.Init("a", params_, kDefaultPriority, callback.callback(),
- &pool_, BoundNetLog()));
+ handle.Init("a", params_, kDefaultPriority,
+ ClientSocketPool::IgnoreLimits::DISABLED,
+ callback.callback(), &pool_, BoundNetLog()));
ASSERT_EQ(1u, handle.connection_attempts().size());
EXPECT_EQ("127.0.0.1:80",
handle.connection_attempts()[0].endpoint.ToString());
@@ -350,8 +354,9 @@ TEST_F(TransportClientSocketPoolTest, CancelRequestClearGroup) {
TestCompletionCallback callback;
ClientSocketHandle handle;
EXPECT_EQ(ERR_IO_PENDING,
- handle.Init("a", params_, kDefaultPriority, callback.callback(),
- &pool_, BoundNetLog()));
+ handle.Init("a", params_, kDefaultPriority,
+ ClientSocketPool::IgnoreLimits::DISABLED,
+ callback.callback(), &pool_, BoundNetLog()));
handle.Reset();
}
@@ -362,11 +367,13 @@ TEST_F(TransportClientSocketPoolTest, TwoRequestsCancelOne) {
TestCompletionCallback callback2;
EXPECT_EQ(ERR_IO_PENDING,
- handle.Init("a", params_, kDefaultPriority, callback.callback(),
- &pool_, BoundNetLog()));
+ handle.Init("a", params_, kDefaultPriority,
+ ClientSocketPool::IgnoreLimits::DISABLED,
+ callback.callback(), &pool_, BoundNetLog()));
EXPECT_EQ(ERR_IO_PENDING,
- handle2.Init("a", params_, kDefaultPriority, callback2.callback(),
- &pool_, BoundNetLog()));
+ handle2.Init("a", params_, kDefaultPriority,
+ ClientSocketPool::IgnoreLimits::DISABLED,
+ callback2.callback(), &pool_, BoundNetLog()));
handle.Reset();
@@ -380,15 +387,17 @@ TEST_F(TransportClientSocketPoolTest, ConnectCancelConnect) {
ClientSocketHandle handle;
TestCompletionCallback callback;
EXPECT_EQ(ERR_IO_PENDING,
- handle.Init("a", params_, kDefaultPriority, callback.callback(),
- &pool_, BoundNetLog()));
+ handle.Init("a", params_, kDefaultPriority,
+ ClientSocketPool::IgnoreLimits::DISABLED,
+ callback.callback(), &pool_, BoundNetLog()));
handle.Reset();
TestCompletionCallback callback2;
EXPECT_EQ(ERR_IO_PENDING,
- handle.Init("a", params_, kDefaultPriority, callback2.callback(),
- &pool_, BoundNetLog()));
+ handle.Init("a", params_, kDefaultPriority,
+ ClientSocketPool::IgnoreLimits::DISABLED,
+ callback2.callback(), &pool_, BoundNetLog()));
host_resolver_->set_synchronous_mode(true);
// At this point, handle has two ConnectingSockets out for it. Due to the
@@ -497,11 +506,11 @@ class RequestSocketCallback : public TestCompletionCallbackBase {
}
within_callback_ = true;
scoped_refptr<TransportSocketParams> dest(new TransportSocketParams(
- HostPortPair("www.google.com", 80), false, false,
- OnHostResolutionCallback(),
+ HostPortPair("www.google.com", 80), false, OnHostResolutionCallback(),
TransportSocketParams::COMBINE_CONNECT_AND_WRITE_DEFAULT));
- int rv = handle_->Init("a", dest, LOWEST, callback(), pool_,
- BoundNetLog());
+ int rv = handle_->Init("a", dest, LOWEST,
+ ClientSocketPool::IgnoreLimits::DISABLED,
+ callback(), pool_, BoundNetLog());
EXPECT_EQ(OK, rv);
}
}
@@ -518,11 +527,11 @@ TEST_F(TransportClientSocketPoolTest, RequestTwice) {
ClientSocketHandle handle;
RequestSocketCallback callback(&handle, &pool_);
scoped_refptr<TransportSocketParams> dest(new TransportSocketParams(
- HostPortPair("www.google.com", 80), false, false,
- OnHostResolutionCallback(),
+ HostPortPair("www.google.com", 80), false, OnHostResolutionCallback(),
TransportSocketParams::COMBINE_CONNECT_AND_WRITE_DEFAULT));
- int rv = handle.Init("a", dest, LOWEST, callback.callback(), &pool_,
- BoundNetLog());
+ int rv =
+ handle.Init("a", dest, LOWEST, ClientSocketPool::IgnoreLimits::DISABLED,
+ callback.callback(), &pool_, BoundNetLog());
ASSERT_EQ(ERR_IO_PENDING, rv);
// The callback is going to request "www.google.com". We want it to complete
@@ -584,8 +593,9 @@ TEST_F(TransportClientSocketPoolTest, FailingActiveRequestWithPendingRequests) {
TEST_F(TransportClientSocketPoolTest, IdleSocketLoadTiming) {
TestCompletionCallback callback;
ClientSocketHandle handle;
- int rv = handle.Init("a", params_, LOW, callback.callback(), &pool_,
- BoundNetLog());
+ int rv =
+ handle.Init("a", params_, LOW, ClientSocketPool::IgnoreLimits::DISABLED,
+ callback.callback(), &pool_, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_FALSE(handle.is_initialized());
EXPECT_FALSE(handle.socket());
@@ -602,8 +612,8 @@ TEST_F(TransportClientSocketPoolTest, IdleSocketLoadTiming) {
// Now we should have 1 idle socket.
EXPECT_EQ(1, pool_.IdleSocketCount());
- rv = handle.Init("a", params_, LOW, callback.callback(), &pool_,
- BoundNetLog());
+ rv = handle.Init("a", params_, LOW, ClientSocketPool::IgnoreLimits::DISABLED,
+ callback.callback(), &pool_, BoundNetLog());
EXPECT_EQ(OK, rv);
EXPECT_EQ(0, pool_.IdleSocketCount());
TestLoadTimingInfoConnectedReused(handle);
@@ -612,8 +622,9 @@ TEST_F(TransportClientSocketPoolTest, IdleSocketLoadTiming) {
TEST_F(TransportClientSocketPoolTest, ResetIdleSocketsOnIPAddressChange) {
TestCompletionCallback callback;
ClientSocketHandle handle;
- int rv = handle.Init("a", params_, LOW, callback.callback(), &pool_,
- BoundNetLog());
+ int rv =
+ handle.Init("a", params_, LOW, ClientSocketPool::IgnoreLimits::DISABLED,
+ callback.callback(), &pool_, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_FALSE(handle.is_initialized());
EXPECT_FALSE(handle.socket());
@@ -668,8 +679,9 @@ TEST_F(TransportClientSocketPoolTest, BackupSocketConnect) {
TestCompletionCallback callback;
ClientSocketHandle handle;
- int rv = handle.Init("b", params_, LOW, callback.callback(), &pool_,
- BoundNetLog());
+ int rv =
+ handle.Init("b", params_, LOW, ClientSocketPool::IgnoreLimits::DISABLED,
+ callback.callback(), &pool_, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_FALSE(handle.is_initialized());
EXPECT_FALSE(handle.socket());
@@ -710,8 +722,9 @@ TEST_F(TransportClientSocketPoolTest, BackupSocketCancel) {
TestCompletionCallback callback;
ClientSocketHandle handle;
- int rv = handle.Init("c", params_, LOW, callback.callback(), &pool_,
- BoundNetLog());
+ int rv =
+ handle.Init("c", params_, LOW, ClientSocketPool::IgnoreLimits::DISABLED,
+ callback.callback(), &pool_, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_FALSE(handle.is_initialized());
EXPECT_FALSE(handle.socket());
@@ -756,8 +769,9 @@ TEST_F(TransportClientSocketPoolTest, BackupSocketFailAfterStall) {
TestCompletionCallback callback;
ClientSocketHandle handle;
- int rv = handle.Init("b", params_, LOW, callback.callback(), &pool_,
- BoundNetLog());
+ int rv =
+ handle.Init("b", params_, LOW, ClientSocketPool::IgnoreLimits::DISABLED,
+ callback.callback(), &pool_, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_FALSE(handle.is_initialized());
EXPECT_FALSE(handle.socket());
@@ -806,8 +820,9 @@ TEST_F(TransportClientSocketPoolTest, BackupSocketFailAfterDelay) {
TestCompletionCallback callback;
ClientSocketHandle handle;
- int rv = handle.Init("b", params_, LOW, callback.callback(), &pool_,
- BoundNetLog());
+ int rv =
+ handle.Init("b", params_, LOW, ClientSocketPool::IgnoreLimits::DISABLED,
+ callback.callback(), &pool_, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_FALSE(handle.is_initialized());
EXPECT_FALSE(handle.socket());
@@ -863,8 +878,9 @@ TEST_F(TransportClientSocketPoolTest, IPv6FallbackSocketIPv4FinishesFirst) {
TestCompletionCallback callback;
ClientSocketHandle handle;
- int rv = handle.Init("a", params_, LOW, callback.callback(), &pool,
- BoundNetLog());
+ int rv =
+ handle.Init("a", params_, LOW, ClientSocketPool::IgnoreLimits::DISABLED,
+ callback.callback(), &pool, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_FALSE(handle.is_initialized());
EXPECT_FALSE(handle.socket());
@@ -915,8 +931,9 @@ TEST_F(TransportClientSocketPoolTest, IPv6FallbackSocketIPv6FinishesFirst) {
TestCompletionCallback callback;
ClientSocketHandle handle;
- int rv = handle.Init("a", params_, LOW, callback.callback(), &pool,
- BoundNetLog());
+ int rv =
+ handle.Init("a", params_, LOW, ClientSocketPool::IgnoreLimits::DISABLED,
+ callback.callback(), &pool, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_FALSE(handle.is_initialized());
EXPECT_FALSE(handle.socket());
@@ -957,8 +974,9 @@ TEST_F(TransportClientSocketPoolTest, IPv6NoIPv4AddressesToFallbackTo) {
TestCompletionCallback callback;
ClientSocketHandle handle;
- int rv = handle.Init("a", params_, LOW, callback.callback(), &pool,
- BoundNetLog());
+ int rv =
+ handle.Init("a", params_, LOW, ClientSocketPool::IgnoreLimits::DISABLED,
+ callback.callback(), &pool, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_FALSE(handle.is_initialized());
EXPECT_FALSE(handle.socket());
@@ -990,8 +1008,9 @@ TEST_F(TransportClientSocketPoolTest, IPv4HasNoFallback) {
TestCompletionCallback callback;
ClientSocketHandle handle;
- int rv = handle.Init("a", params_, LOW, callback.callback(), &pool,
- BoundNetLog());
+ int rv =
+ handle.Init("a", params_, LOW, ClientSocketPool::IgnoreLimits::DISABLED,
+ callback.callback(), &pool, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_FALSE(handle.is_initialized());
EXPECT_FALSE(handle.socket());
@@ -1025,7 +1044,8 @@ TEST_F(TransportClientSocketPoolTest, TCPFastOpenOnIPv4WithNoFallback) {
ClientSocketHandle handle;
// Enable TCP FastOpen in TransportSocketParams.
scoped_refptr<TransportSocketParams> params = CreateParamsForTCPFastOpen();
- handle.Init("a", params, LOW, callback.callback(), &pool, BoundNetLog());
+ handle.Init("a", params, LOW, ClientSocketPool::IgnoreLimits::DISABLED,
+ callback.callback(), &pool, BoundNetLog());
EXPECT_EQ(OK, callback.WaitForResult());
EXPECT_TRUE(handle.socket()->UsingTCPFastOpen());
}
@@ -1050,7 +1070,8 @@ TEST_F(TransportClientSocketPoolTest, TCPFastOpenOnIPv6WithNoFallback) {
ClientSocketHandle handle;
// Enable TCP FastOpen in TransportSocketParams.
scoped_refptr<TransportSocketParams> params = CreateParamsForTCPFastOpen();
- handle.Init("a", params, LOW, callback.callback(), &pool, BoundNetLog());
+ handle.Init("a", params, LOW, ClientSocketPool::IgnoreLimits::DISABLED,
+ callback.callback(), &pool, BoundNetLog());
EXPECT_EQ(OK, callback.WaitForResult());
EXPECT_TRUE(handle.socket()->UsingTCPFastOpen());
}
@@ -1083,7 +1104,8 @@ TEST_F(TransportClientSocketPoolTest,
ClientSocketHandle handle;
// Enable TCP FastOpen in TransportSocketParams.
scoped_refptr<TransportSocketParams> params = CreateParamsForTCPFastOpen();
- handle.Init("a", params, LOW, callback.callback(), &pool, BoundNetLog());
+ handle.Init("a", params, LOW, ClientSocketPool::IgnoreLimits::DISABLED,
+ callback.callback(), &pool, BoundNetLog());
EXPECT_EQ(OK, callback.WaitForResult());
// Verify that the socket used is connected to the fallback IPv4 address.
IPEndPoint endpoint;
@@ -1122,7 +1144,8 @@ TEST_F(TransportClientSocketPoolTest,
ClientSocketHandle handle;
// Enable TCP FastOpen in TransportSocketParams.
scoped_refptr<TransportSocketParams> params = CreateParamsForTCPFastOpen();
- handle.Init("a", params, LOW, callback.callback(), &pool, BoundNetLog());
+ handle.Init("a", params, LOW, ClientSocketPool::IgnoreLimits::DISABLED,
+ callback.callback(), &pool, BoundNetLog());
EXPECT_EQ(OK, callback.WaitForResult());
// Verify that the socket used is connected to the IPv6 address.
IPEndPoint endpoint;
« net/socket/client_socket_pool_base_unittest.cc ('K') | « net/socket/transport_client_socket_pool.cc ('k') | net/socket/websocket_transport_client_socket_pool.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698