Update from https://crrev.com/312398

net/http/http_proxy_client_socket_pool_unittest.cc

Index: net/http/http_proxy_client_socket_pool_unittest.cc
diff --git a/net/http/http_proxy_client_socket_pool_unittest.cc b/net/http/http_proxy_client_socket_pool_unittest.cc
index cef53e9f2513d377cbd3d2e1ea403cccf652a58c..62c50c024d26c805a5ce08f942aa0f808adbdc48 100644
--- a/net/http/http_proxy_client_socket_pool_unittest.cc
+++ b/net/http/http_proxy_client_socket_pool_unittest.cc
@@ -166,7 +166,6 @@ class HttpProxyClientSocketPoolTest
         ssl_socket_pool_(kMaxSockets,
                          kMaxSocketsPerGroup,
                          &ssl_histograms_,
-                         session_deps_.host_resolver.get(),
                          session_deps_.cert_verifier.get(),
                          NULL /* channel_id_store */,
                          NULL /* transport_security_state */,
@@ -186,7 +185,6 @@ class HttpProxyClientSocketPoolTest
         pool_(kMaxSockets,
               kMaxSocketsPerGroup,
               &http_proxy_histograms_,
-              NULL,
               &transport_socket_pool_,
               &ssl_socket_pool_,
               NULL) {}