From 90499486eb26f12da3456f01bd28abc4a6191ea4 Mon Sep 17 00:00:00 2001
From: "rsleevi@chromium.org"
 <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Sat, 1 Jun 2013 00:39:50 +0000
Subject: Update net/ to use scoped_refptr<T>::get() rather than implicit
 "operator T*"

Linux fixes

BUG=110610
TBR=darin

Review URL: https://chromiumcodereview.appspot.com/15829004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203535 0039d316-1c4b-4281-b951-d872f2087c98
---
 net/socket/client_socket_pool_manager_impl.cc | 35 +++++++++++++--------------
 1 file changed, 17 insertions(+), 18 deletions(-)

(limited to 'net/socket/client_socket_pool_manager_impl.cc')

diff --git a/net/socket/client_socket_pool_manager_impl.cc b/net/socket/client_socket_pool_manager_impl.cc
index 95dcf2f..e8fabaa 100644
--- a/net/socket/client_socket_pool_manager_impl.cc
+++ b/net/socket/client_socket_pool_manager_impl.cc
@@ -277,23 +277,22 @@ ClientSocketPoolManagerImpl::GetSocketPoolForHTTPProxy(
   DCHECK(tcp_https_ret.second);
 
   std::pair<SSLSocketPoolMap::iterator, bool> ssl_https_ret =
-      ssl_socket_pools_for_https_proxies_.insert(
-          std::make_pair(
-              http_proxy,
-              new SSLClientSocketPool(
-                  max_sockets_per_proxy_server(pool_type_),
-                  max_sockets_per_group(pool_type_),
-                  &ssl_for_https_proxy_pool_histograms_,
-                  host_resolver_,
-                  cert_verifier_,
-                  server_bound_cert_service_,
-                  transport_security_state_,
-                  ssl_session_cache_shard_,
-                  socket_factory_,
-                  tcp_https_ret.first->second /* https proxy */,
-                  NULL /* no socks proxy */,
-                  NULL /* no http proxy */,
-                  ssl_config_service_, net_log_)));
+      ssl_socket_pools_for_https_proxies_.insert(std::make_pair(
+          http_proxy,
+          new SSLClientSocketPool(max_sockets_per_proxy_server(pool_type_),
+                                  max_sockets_per_group(pool_type_),
+                                  &ssl_for_https_proxy_pool_histograms_,
+                                  host_resolver_,
+                                  cert_verifier_,
+                                  server_bound_cert_service_,
+                                  transport_security_state_,
+                                  ssl_session_cache_shard_,
+                                  socket_factory_,
+                                  tcp_https_ret.first->second /* https proxy */,
+                                  NULL /* no socks proxy */,
+                                  NULL /* no http proxy */,
+                                  ssl_config_service_.get(),
+                                  net_log_)));
   DCHECK(tcp_https_ret.second);
 
   std::pair<HTTPProxySocketPoolMap::iterator, bool> ret =
@@ -332,7 +331,7 @@ SSLClientSocketPool* ClientSocketPoolManagerImpl::GetSocketPoolForSSLWithProxy(
       NULL, /* no tcp pool, we always go through a proxy */
       GetSocketPoolForSOCKSProxy(proxy_server),
       GetSocketPoolForHTTPProxy(proxy_server),
-      ssl_config_service_,
+      ssl_config_service_.get(),
       net_log_);
 
   std::pair<SSLSocketPoolMap::iterator, bool> ret =
-- 
cgit v1.1