Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(459)

Unified Diff: net/socket/ssl_client_socket_pool.cc

Issue 851503003: Update from https://crrev.com/311076 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/socket/ssl_client_socket_pool.h ('k') | net/socket/ssl_client_socket_pool_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/ssl_client_socket_pool.cc
diff --git a/net/socket/ssl_client_socket_pool.cc b/net/socket/ssl_client_socket_pool.cc
index c3b98b80a63885e58a5edbd6a9a724d0242aa9f9..0e75a209d7fdf153004e87c762edd11fe5015412 100644
--- a/net/socket/ssl_client_socket_pool.cc
+++ b/net/socket/ssl_client_socket_pool.cc
@@ -177,7 +177,6 @@ SSLConnectJob::SSLConnectJob(const std::string& group_name,
SOCKSClientSocketPool* socks_pool,
HttpProxyClientSocketPool* http_proxy_pool,
ClientSocketFactory* client_socket_factory,
- HostResolver* host_resolver,
const SSLClientSocketContext& context,
const GetMessengerCallback& get_messenger_callback,
Delegate* delegate,
@@ -192,7 +191,6 @@ SSLConnectJob::SSLConnectJob(const std::string& group_name,
socks_pool_(socks_pool),
http_proxy_pool_(http_proxy_pool),
client_socket_factory_(client_socket_factory),
- host_resolver_(host_resolver),
context_(context.cert_verifier,
context.channel_id_service,
context.transport_security_state,
@@ -700,7 +698,6 @@ scoped_ptr<ConnectJob> SSLClientSocketPool::SSLConnectJobFactory::NewConnectJob(
socks_pool_,
http_proxy_pool_,
client_socket_factory_,
- host_resolver_,
context_,
get_messenger_callback_,
delegate,
« no previous file with comments | « net/socket/ssl_client_socket_pool.h ('k') | net/socket/ssl_client_socket_pool_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698