Use ClientSocketPool::SocketParams everywhere.
A lot of places were using TransportClientSocketPool::SocketParams to
refer to the class.
Bug: 944095
Change-Id: I4d5638e43a46ced2a3ef1f293b616b2b549fa69e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1532913
Commit-Queue: Matt Menke <[email protected]>
Reviewed-by: Asanka Herath <[email protected]>
Cr-Commit-Position: refs/heads/master@{#644611}diff --git a/net/socket/client_socket_pool_base_unittest.cc b/net/socket/client_socket_pool_base_unittest.cc
index 0629fa6..98b52d8 100644
--- a/net/socket/client_socket_pool_base_unittest.cc
+++ b/net/socket/client_socket_pool_base_unittest.cc
@@ -76,13 +76,12 @@
privacy_mode);
}
-// Returns a TransportClientSocketPool::SocketParams that will never be used to
+// Returns a ClientSocketPool::SocketParams that will never be used to
// create a real TreansportConnectJob.
-scoped_refptr<TransportClientSocketPool::SocketParams> CreateDummyParams() {
- return TransportClientSocketPool::SocketParams::
- CreateFromTransportSocketParams(
- base::MakeRefCounted<TransportSocketParams>(
- HostPortPair("ignored", 80), OnHostResolutionCallback()));
+scoped_refptr<ClientSocketPool::SocketParams> CreateDummyParams() {
+ return ClientSocketPool::SocketParams::CreateFromTransportSocketParams(
+ base::MakeRefCounted<TransportSocketParams>(HostPortPair("ignored", 80),
+ OnHostResolutionCallback()));
}
// Make sure |handle| sets load times correctly when it has been assigned a
@@ -705,7 +704,7 @@
MockClientSocketFactory client_socket_factory_;
TestConnectJobFactory* connect_job_factory_;
// These parameters are never actually used to create a TransportConnectJob.
- scoped_refptr<TransportClientSocketPool::SocketParams> params_;
+ scoped_refptr<ClientSocketPool::SocketParams> params_;
std::unique_ptr<TransportClientSocketPool> pool_;
ClientSocketPoolTest test_base_;
};
@@ -2766,7 +2765,7 @@
public:
ConnectWithinCallback(
const ClientSocketPool::GroupId& group_id,
- const scoped_refptr<TransportClientSocketPool::SocketParams>& params,
+ const scoped_refptr<ClientSocketPool::SocketParams>& params,
TransportClientSocketPool* pool)
: group_id_(group_id), params_(params), pool_(pool) {}
@@ -2793,7 +2792,7 @@
}
const ClientSocketPool::GroupId group_id_;
- const scoped_refptr<TransportClientSocketPool::SocketParams> params_;
+ const scoped_refptr<ClientSocketPool::SocketParams> params_;
TransportClientSocketPool* const pool_;
ClientSocketHandle handle_;
TestCompletionCallback nested_callback_;
@@ -4875,7 +4874,7 @@
~TestAuthHelper() = default;
void InitHandle(
- scoped_refptr<TransportClientSocketPool::SocketParams> params,
+ scoped_refptr<ClientSocketPool::SocketParams> params,
TransportClientSocketPool* pool,
RequestPriority priority = DEFAULT_PRIORITY,
ClientSocketPool::RespectLimits respect_limits =
