Remove ClientSocketFactory constructors that take ClientSocketHandles.
All StreamSocket layers are now beneath the socket pools, so there's no
longer any reason for any of them to be on top of ClientSocketHandles
instead of other SocketStreams.
Bug: 472729
Change-Id: I1b0471c421181eee2c28388bc1b705011d0d3dd9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1495596
Reviewed-by: mark a. foltz <[email protected]>
Reviewed-by: Asanka Herath <[email protected]>
Reviewed-by: Reilly Grant <[email protected]>
Reviewed-by: Sergey Ulanov <[email protected]>
Commit-Queue: Matt Menke <[email protected]>
Cr-Commit-Position: refs/heads/master@{#637887}diff --git a/net/socket/client_socket_pool_base_unittest.cc b/net/socket/client_socket_pool_base_unittest.cc
index 0edabe39..07af0295 100644
--- a/net/socket/client_socket_pool_base_unittest.cc
+++ b/net/socket/client_socket_pool_base_unittest.cc
@@ -235,7 +235,7 @@
}
std::unique_ptr<SSLClientSocket> CreateSSLClientSocket(
- std::unique_ptr<ClientSocketHandle> transport_socket,
+ std::unique_ptr<StreamSocket> stream_socket,
const HostPortPair& host_and_port,
const SSLConfig& ssl_config,
const SSLClientSocketContext& context) override {
@@ -243,31 +243,6 @@
return std::unique_ptr<SSLClientSocket>();
}
- std::unique_ptr<SSLClientSocket> CreateSSLClientSocket(
- std::unique_ptr<StreamSocket> nested_socket,
- const HostPortPair& host_and_port,
- const SSLConfig& ssl_config,
- const SSLClientSocketContext& context) override {
- NOTIMPLEMENTED();
- return std::unique_ptr<SSLClientSocket>();
- }
-
- std::unique_ptr<ProxyClientSocket> CreateProxyClientSocket(
- std::unique_ptr<ClientSocketHandle> transport_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;
- }
-
std::unique_ptr<ProxyClientSocket> CreateProxyClientSocket(
std::unique_ptr<StreamSocket> stream_socket,
const std::string& user_agent,
