summaryrefslogtreecommitdiffstats
path: root/net/socket/client_socket_pool_base_unittest.cc
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-15 17:49:26 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-15 17:49:26 +0000
commit12322e7e3bda987884a4bcbf7301e9dd978068a5 (patch)
tree4e715d7019c49247925c875090fd0c28bf0bbeff /net/socket/client_socket_pool_base_unittest.cc
parentf681ce9e5368b9defee10ab326293d7759c4f928 (diff)
downloadchromium_src-12322e7e3bda987884a4bcbf7301e9dd978068a5.zip
chromium_src-12322e7e3bda987884a4bcbf7301e9dd978068a5.tar.gz
chromium_src-12322e7e3bda987884a4bcbf7301e9dd978068a5.tar.bz2
Remove SocketParams template parameter for functions templated on PoolType
Instead, make the various socket pool classes have a SocketParams inner class/typedef. This eliminates a bunch of boilerplate. BUG=166689 R=mmenke@chromium.org Review URL: https://codereview.chromium.org/22893007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@217811 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/client_socket_pool_base_unittest.cc')
-rw-r--r--net/socket/client_socket_pool_base_unittest.cc9
1 files changed, 4 insertions, 5 deletions
diff --git a/net/socket/client_socket_pool_base_unittest.cc b/net/socket/client_socket_pool_base_unittest.cc
index 6688e01..f0ba828 100644
--- a/net/socket/client_socket_pool_base_unittest.cc
+++ b/net/socket/client_socket_pool_base_unittest.cc
@@ -468,6 +468,8 @@ class TestConnectJobFactory
class TestClientSocketPool : public ClientSocketPool {
public:
+ typedef TestSocketParams SocketParams;
+
TestClientSocketPool(
int max_sockets,
int max_sockets_per_group,
@@ -601,8 +603,6 @@ class TestClientSocketPool : public ClientSocketPool {
} // namespace
-REGISTER_SOCKET_PARAMS_FOR_POOL(TestClientSocketPool, TestSocketParams);
-
namespace {
void MockClientSocketFactory::SignalJobs() {
@@ -705,9 +705,8 @@ class ClientSocketPoolBaseTest : public testing::Test {
const std::string& group_name,
RequestPriority priority,
const scoped_refptr<TestSocketParams>& params) {
- return test_base_.StartRequestUsingPool<
- TestClientSocketPool, TestSocketParams>(
- pool_.get(), group_name, priority, params);
+ return test_base_.StartRequestUsingPool(
+ pool_.get(), group_name, priority, params);
}
int StartRequest(const std::string& group_name, RequestPriority priority) {