Socket Pools Refactor 22: Let HttpProxyClientSocket take a StreamSocket.
Previously, an HttpProxyClientSocket could only be created with a
ClientSocketHandle, but this CL adds a new constructor that lets it be
created with a StreamSocket, which doesn't require a SocketPool.
The new constructor is not yet in use. We can switch which constructor
is used, and remove the old constructor in followup CLs.
This is part of an effort to flatten the socket pools.
https://docs.google.com/document/d/1g0EA4iDqaDhNXA_mq-YK3SlSX-xRkoKvZetAQqdRrxM/edit
[email protected], [email protected]
Bug: 472729
Change-Id: I9ff442042142787280421b2afbccf1609f27d048
Reviewed-on: https://chromium-review.googlesource.com/c/1450865
Reviewed-by: Matt Menke <[email protected]>
Reviewed-by: mark a. foltz <[email protected]>
Reviewed-by: Asanka Herath <[email protected]>
Commit-Queue: Matt Menke <[email protected]>
Cr-Commit-Position: refs/heads/master@{#630222}diff --git a/net/socket/client_socket_pool_base_unittest.cc b/net/socket/client_socket_pool_base_unittest.cc
index e7380c8..e39f164c 100644
--- a/net/socket/client_socket_pool_base_unittest.cc
+++ b/net/socket/client_socket_pool_base_unittest.cc
@@ -266,6 +266,22 @@
return nullptr;
}
+ std::unique_ptr<ProxyClientSocket> CreateProxyClientSocket(
+ std::unique_ptr<StreamSocket> stream_socket,
+ const std::string& user_agent,
+ const HostPortPair& endpoint,
+ const ProxyServer& proxy_server,
+ HttpAuthController* http_auth_controller,
+ bool tunnel,
+ bool using_spdy,
+ NextProto negotiated_protocol,
+ ProxyDelegate* proxy_delegate,
+ bool is_https_proxy,
+ const NetworkTrafficAnnotationTag& traffic_annotation) override {
+ NOTIMPLEMENTED();
+ return nullptr;
+ }
+
void WaitForSignal(TestConnectJob* job) { waiting_jobs_.push_back(job); }
void SignalJobs();
