Socket Pool: Inline ClientSocketPoolBaseHelper, 2 of 4
Make ClientSocketPool methods to request sockets take SocketParams
instead of void*. This will allow the ClientSocketPoolBaseHelper code
to be moved to TransportClientSocketPool, without the need for any
casting.
Although SocketParams is now an inner class of ClientSocketPool, there
are still a lot of remaining "TransportClientSocketPool::SocketParams"
variable declarations. I'll clean these up in another CL.
Bug: 944095
Change-Id: I67fae65ca422f570f4631be9ce13dafe3f2ba8ba
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1529942
Commit-Queue: Matt Menke <[email protected]>
Reviewed-by: Asanka Herath <[email protected]>
Cr-Commit-Position: refs/heads/master@{#644000}diff --git a/net/socket/client_socket_pool_base_unittest.cc b/net/socket/client_socket_pool_base_unittest.cc
index 035679f..58593e3 100644
--- a/net/socket/client_socket_pool_base_unittest.cc
+++ b/net/socket/client_socket_pool_base_unittest.cc
@@ -3277,7 +3277,7 @@
CreatePool(kDefaultMaxSockets, kDefaultMaxSocketsPerGroup);
connect_job_factory_->set_job_type(TestConnectJob::kMockPendingJob);
- pool_->RequestSockets(TestGroupId("a"), ¶ms_, 2, NetLogWithSource());
+ pool_->RequestSockets(TestGroupId("a"), params_, 2, NetLogWithSource());
ASSERT_TRUE(pool_->HasGroupForTesting(TestGroupId("a")));
EXPECT_EQ(2u, pool_->NumConnectJobsInGroupForTesting(TestGroupId("a")));
@@ -3346,7 +3346,7 @@
pool_->NumUnassignedConnectJobsInGroupForTesting(TestGroupId("a")));
EXPECT_EQ(0u, pool_->IdleSocketCountInGroup(TestGroupId("a")));
- pool_->RequestSockets(TestGroupId("a"), ¶ms_, 2, NetLogWithSource());
+ pool_->RequestSockets(TestGroupId("a"), params_, 2, NetLogWithSource());
EXPECT_EQ(2u, pool_->NumConnectJobsInGroupForTesting(TestGroupId("a")));
EXPECT_EQ(1u, pool_->NumNeverAssignedConnectJobsInGroupForTesting(
@@ -3424,7 +3424,7 @@
pool_->NumUnassignedConnectJobsInGroupForTesting(TestGroupId("a")));
EXPECT_EQ(0u, pool_->IdleSocketCountInGroup(TestGroupId("a")));
- pool_->RequestSockets(TestGroupId("a"), ¶ms_, 2, NetLogWithSource());
+ pool_->RequestSockets(TestGroupId("a"), params_, 2, NetLogWithSource());
EXPECT_EQ(3u, pool_->NumConnectJobsInGroupForTesting(TestGroupId("a")));
EXPECT_EQ(0u, pool_->NumNeverAssignedConnectJobsInGroupForTesting(
@@ -3454,7 +3454,7 @@
ASSERT_FALSE(pool_->HasGroupForTesting(TestGroupId("a")));
- pool_->RequestSockets(TestGroupId("a"), ¶ms_, kDefaultMaxSockets,
+ pool_->RequestSockets(TestGroupId("a"), params_, kDefaultMaxSockets,
NetLogWithSource());
ASSERT_TRUE(pool_->HasGroupForTesting(TestGroupId("a")));
@@ -3471,7 +3471,7 @@
ASSERT_FALSE(pool_->HasGroupForTesting(TestGroupId("b")));
- pool_->RequestSockets(TestGroupId("b"), ¶ms_, kDefaultMaxSockets,
+ pool_->RequestSockets(TestGroupId("b"), params_, kDefaultMaxSockets,
NetLogWithSource());
ASSERT_FALSE(pool_->HasGroupForTesting(TestGroupId("b")));
@@ -3483,7 +3483,7 @@
ASSERT_FALSE(pool_->HasGroupForTesting(TestGroupId("a")));
- pool_->RequestSockets(TestGroupId("a"), ¶ms_, kDefaultMaxSockets - 1,
+ pool_->RequestSockets(TestGroupId("a"), params_, kDefaultMaxSockets - 1,
NetLogWithSource());
ASSERT_TRUE(pool_->HasGroupForTesting(TestGroupId("a")));
@@ -3501,7 +3501,7 @@
ASSERT_FALSE(pool_->HasGroupForTesting(TestGroupId("b")));
- pool_->RequestSockets(TestGroupId("b"), ¶ms_, kDefaultMaxSockets,
+ pool_->RequestSockets(TestGroupId("b"), params_, kDefaultMaxSockets,
NetLogWithSource());
ASSERT_TRUE(pool_->HasGroupForTesting(TestGroupId("b")));
@@ -3532,7 +3532,7 @@
pool_->NumUnassignedConnectJobsInGroupForTesting(TestGroupId("a")));
EXPECT_EQ(1u, pool_->IdleSocketCountInGroup(TestGroupId("a")));
- pool_->RequestSockets(TestGroupId("a"), ¶ms_, 2, NetLogWithSource());
+ pool_->RequestSockets(TestGroupId("a"), params_, 2, NetLogWithSource());
EXPECT_EQ(1u, pool_->NumConnectJobsInGroupForTesting(TestGroupId("a")));
EXPECT_EQ(1u, pool_->NumNeverAssignedConnectJobsInGroupForTesting(
@@ -3565,7 +3565,7 @@
EXPECT_EQ(0u, pool_->IdleSocketCountInGroup(TestGroupId("a")));
EXPECT_EQ(1, pool_->NumActiveSocketsInGroupForTesting(TestGroupId("a")));
- pool_->RequestSockets(TestGroupId("a"), ¶ms_, 2, NetLogWithSource());
+ pool_->RequestSockets(TestGroupId("a"), params_, 2, NetLogWithSource());
EXPECT_EQ(1u, pool_->NumConnectJobsInGroupForTesting(TestGroupId("a")));
EXPECT_EQ(1u, pool_->NumNeverAssignedConnectJobsInGroupForTesting(
@@ -3580,7 +3580,7 @@
CreatePool(kDefaultMaxSockets, kDefaultMaxSocketsPerGroup);
connect_job_factory_->set_job_type(TestConnectJob::kMockJob);
- pool_->RequestSockets(TestGroupId("a"), ¶ms_, kDefaultMaxSocketsPerGroup,
+ pool_->RequestSockets(TestGroupId("a"), params_, kDefaultMaxSocketsPerGroup,
NetLogWithSource());
ASSERT_TRUE(pool_->HasGroupForTesting(TestGroupId("a")));
@@ -3592,7 +3592,7 @@
EXPECT_EQ(kDefaultMaxSocketsPerGroup,
static_cast<int>(pool_->IdleSocketCountInGroup(TestGroupId("a"))));
- pool_->RequestSockets(TestGroupId("b"), ¶ms_, kDefaultMaxSocketsPerGroup,
+ pool_->RequestSockets(TestGroupId("b"), params_, kDefaultMaxSocketsPerGroup,
NetLogWithSource());
EXPECT_EQ(0u, pool_->NumConnectJobsInGroupForTesting(TestGroupId("b")));
@@ -3608,14 +3608,14 @@
CreatePool(kDefaultMaxSockets, kDefaultMaxSocketsPerGroup);
connect_job_factory_->set_job_type(TestConnectJob::kMockFailingJob);
- pool_->RequestSockets(TestGroupId("a"), ¶ms_, kDefaultMaxSocketsPerGroup,
+ pool_->RequestSockets(TestGroupId("a"), params_, kDefaultMaxSocketsPerGroup,
NetLogWithSource());
ASSERT_FALSE(pool_->HasGroupForTesting(TestGroupId("a")));
connect_job_factory_->set_job_type(
TestConnectJob::kMockAdditionalErrorStateJob);
- pool_->RequestSockets(TestGroupId("a"), ¶ms_, kDefaultMaxSocketsPerGroup,
+ pool_->RequestSockets(TestGroupId("a"), params_, kDefaultMaxSocketsPerGroup,
NetLogWithSource());
ASSERT_FALSE(pool_->HasGroupForTesting(TestGroupId("a")));
@@ -3625,7 +3625,7 @@
CreatePool(4, 4);
connect_job_factory_->set_job_type(TestConnectJob::kMockWaitingJob);
- pool_->RequestSockets(TestGroupId("a"), ¶ms_, 2, NetLogWithSource());
+ pool_->RequestSockets(TestGroupId("a"), params_, 2, NetLogWithSource());
ASSERT_TRUE(pool_->HasGroupForTesting(TestGroupId("a")));
EXPECT_EQ(2u, pool_->NumConnectJobsInGroupForTesting(TestGroupId("a")));
@@ -3636,7 +3636,7 @@
EXPECT_EQ(0, pool_->NumActiveSocketsInGroupForTesting(TestGroupId("a")));
EXPECT_EQ(0u, pool_->IdleSocketCountInGroup(TestGroupId("a")));
- pool_->RequestSockets(TestGroupId("a"), ¶ms_, 2, NetLogWithSource());
+ pool_->RequestSockets(TestGroupId("a"), params_, 2, NetLogWithSource());
EXPECT_EQ(2u, pool_->NumConnectJobsInGroupForTesting(TestGroupId("a")));
EXPECT_EQ(2u, pool_->NumNeverAssignedConnectJobsInGroupForTesting(
TestGroupId("a")));
@@ -3695,7 +3695,7 @@
EXPECT_EQ(0, pool_->NumActiveSocketsInGroupForTesting(TestGroupId("a")));
EXPECT_EQ(2u, pool_->IdleSocketCountInGroup(TestGroupId("a")));
- pool_->RequestSockets(TestGroupId("a"), ¶ms_, 2, NetLogWithSource());
+ pool_->RequestSockets(TestGroupId("a"), params_, 2, NetLogWithSource());
EXPECT_EQ(0u, pool_->NumConnectJobsInGroupForTesting(TestGroupId("a")));
EXPECT_EQ(0u, pool_->NumNeverAssignedConnectJobsInGroupForTesting(
TestGroupId("a")));
@@ -3709,7 +3709,7 @@
CreatePool(4, 4);
connect_job_factory_->set_job_type(TestConnectJob::kMockPendingJob);
- pool_->RequestSockets(TestGroupId("a"), ¶ms_, 1, NetLogWithSource());
+ pool_->RequestSockets(TestGroupId("a"), params_, 1, NetLogWithSource());
ASSERT_TRUE(pool_->HasGroupForTesting(TestGroupId("a")));
EXPECT_EQ(1u, pool_->NumConnectJobsInGroupForTesting(TestGroupId("a")));
@@ -3719,7 +3719,7 @@
pool_->NumUnassignedConnectJobsInGroupForTesting(TestGroupId("a")));
EXPECT_EQ(0u, pool_->IdleSocketCountInGroup(TestGroupId("a")));
- pool_->RequestSockets(TestGroupId("a"), ¶ms_, 2, NetLogWithSource());
+ pool_->RequestSockets(TestGroupId("a"), params_, 2, NetLogWithSource());
EXPECT_EQ(2u, pool_->NumConnectJobsInGroupForTesting(TestGroupId("a")));
EXPECT_EQ(2u, pool_->NumNeverAssignedConnectJobsInGroupForTesting(
TestGroupId("a")));
@@ -3727,7 +3727,7 @@
pool_->NumUnassignedConnectJobsInGroupForTesting(TestGroupId("a")));
EXPECT_EQ(0u, pool_->IdleSocketCountInGroup(TestGroupId("a")));
- pool_->RequestSockets(TestGroupId("a"), ¶ms_, 3, NetLogWithSource());
+ pool_->RequestSockets(TestGroupId("a"), params_, 3, NetLogWithSource());
EXPECT_EQ(3u, pool_->NumConnectJobsInGroupForTesting(TestGroupId("a")));
EXPECT_EQ(3u, pool_->NumNeverAssignedConnectJobsInGroupForTesting(
TestGroupId("a")));
@@ -3735,7 +3735,7 @@
pool_->NumUnassignedConnectJobsInGroupForTesting(TestGroupId("a")));
EXPECT_EQ(0u, pool_->IdleSocketCountInGroup(TestGroupId("a")));
- pool_->RequestSockets(TestGroupId("a"), ¶ms_, 1, NetLogWithSource());
+ pool_->RequestSockets(TestGroupId("a"), params_, 1, NetLogWithSource());
EXPECT_EQ(3u, pool_->NumConnectJobsInGroupForTesting(TestGroupId("a")));
EXPECT_EQ(3u, pool_->NumNeverAssignedConnectJobsInGroupForTesting(
TestGroupId("a")));
@@ -3748,7 +3748,7 @@
CreatePool(kDefaultMaxSockets, kDefaultMaxSocketsPerGroup);
connect_job_factory_->set_job_type(TestConnectJob::kMockWaitingJob);
- pool_->RequestSockets(TestGroupId("a"), ¶ms_, 1, NetLogWithSource());
+ pool_->RequestSockets(TestGroupId("a"), params_, 1, NetLogWithSource());
ASSERT_TRUE(pool_->HasGroupForTesting(TestGroupId("a")));
EXPECT_EQ(1u, pool_->NumConnectJobsInGroupForTesting(TestGroupId("a")));
@@ -3798,7 +3798,7 @@
TEST_F(ClientSocketPoolBaseTest, ConnectedPreconnectJobsHaveNoConnectTimes) {
CreatePool(kDefaultMaxSockets, kDefaultMaxSocketsPerGroup);
connect_job_factory_->set_job_type(TestConnectJob::kMockJob);
- pool_->RequestSockets(TestGroupId("a"), ¶ms_, 1, NetLogWithSource());
+ pool_->RequestSockets(TestGroupId("a"), params_, 1, NetLogWithSource());
ASSERT_TRUE(pool_->HasGroupForTesting(TestGroupId("a")));
EXPECT_EQ(0u, pool_->NumConnectJobsInGroupForTesting(TestGroupId("a")));
@@ -3902,7 +3902,7 @@
// Requesting 2 preconnected sockets for "a" should fail to allocate any more
// sockets for "a", and "b" should still have 2 active sockets.
- pool_->RequestSockets(TestGroupId("a"), ¶ms_, 2, NetLogWithSource());
+ pool_->RequestSockets(TestGroupId("a"), params_, 2, NetLogWithSource());
EXPECT_EQ(0u, pool_->NumConnectJobsInGroupForTesting(TestGroupId("a")));
EXPECT_EQ(0u, pool_->NumNeverAssignedConnectJobsInGroupForTesting(
TestGroupId("a")));
@@ -3926,7 +3926,7 @@
EXPECT_EQ(2u, pool_->IdleSocketCountInGroup(TestGroupId("b")));
EXPECT_EQ(0, pool_->NumActiveSocketsInGroupForTesting(TestGroupId("b")));
- pool_->RequestSockets(TestGroupId("a"), ¶ms_, 2, NetLogWithSource());
+ pool_->RequestSockets(TestGroupId("a"), params_, 2, NetLogWithSource());
EXPECT_EQ(1u, pool_->NumConnectJobsInGroupForTesting(TestGroupId("a")));
EXPECT_EQ(1u, pool_->NumNeverAssignedConnectJobsInGroupForTesting(
TestGroupId("a")));
@@ -3951,7 +3951,7 @@
connect_job_factory_->set_job_type(TestConnectJob::kMockWaitingJob);
connect_job_factory_->set_timeout_duration(
base::TimeDelta::FromMilliseconds(500));
- pool_->RequestSockets(TestGroupId("a"), ¶ms_, 1, NetLogWithSource());
+ pool_->RequestSockets(TestGroupId("a"), params_, 1, NetLogWithSource());
EXPECT_EQ(1u, pool_->NumConnectJobsInGroupForTesting(TestGroupId("a")));
EXPECT_EQ(1u, pool_->NumNeverAssignedConnectJobsInGroupForTesting(
TestGroupId("a")));
@@ -3976,7 +3976,7 @@
// Make the ConnectJob hang forever.
connect_job_factory_->set_job_type(TestConnectJob::kMockWaitingJob);
- pool_->RequestSockets(TestGroupId("a"), ¶ms_, 1, NetLogWithSource());
+ pool_->RequestSockets(TestGroupId("a"), params_, 1, NetLogWithSource());
EXPECT_EQ(1u, pool_->NumConnectJobsInGroupForTesting(TestGroupId("a")));
EXPECT_EQ(1u, pool_->NumNeverAssignedConnectJobsInGroupForTesting(
TestGroupId("a")));
@@ -4022,7 +4022,7 @@
CreatePool(kDefaultMaxSockets, kDefaultMaxSocketsPerGroup);
connect_job_factory_->set_job_type(TestConnectJob::kMockUnreadDataJob);
- pool_->RequestSockets(TestGroupId("a"), ¶ms_, 1, NetLogWithSource());
+ pool_->RequestSockets(TestGroupId("a"), params_, 1, NetLogWithSource());
ASSERT_TRUE(pool_->HasGroupForTesting(TestGroupId("a")));
EXPECT_EQ(0u, pool_->NumConnectJobsInGroupForTesting(TestGroupId("a")));
@@ -4147,7 +4147,7 @@
CreatePool(kDefaultMaxSockets, kDefaultMaxSocketsPerGroup);
connect_job_factory_->set_job_type(TestConnectJob::kMockWaitingJob);
- pool_->RequestSockets(TestGroupId("a"), ¶ms_, 1, NetLogWithSource());
+ pool_->RequestSockets(TestGroupId("a"), params_, 1, NetLogWithSource());
ASSERT_TRUE(pool_->HasGroupForTesting(TestGroupId("a")));
EXPECT_EQ(1u, pool_->NumConnectJobsInGroupForTesting(TestGroupId("a")));
