summaryrefslogtreecommitdiffstats
path: root/net/socket/socks_client_socket_pool.cc
diff options
context:
space:
mode:
authorvandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-20 20:37:00 +0000
committervandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-20 20:37:00 +0000
commitb89f7e4d3f98fffe88bd07a57c735e28c37e692c (patch)
treefb0e304d16190673073e62a44a4ef0103ca48876 /net/socket/socks_client_socket_pool.cc
parentb846407ff810e7cfb21642803bd00ed4d4883dc3 (diff)
downloadchromium_src-b89f7e4d3f98fffe88bd07a57c735e28c37e692c.zip
chromium_src-b89f7e4d3f98fffe88bd07a57c735e28c37e692c.tar.gz
chromium_src-b89f7e4d3f98fffe88bd07a57c735e28c37e692c.tar.bz2
Make ClientSocketPool histograms static so that they work properly.
Also change their names so that they appear all together on the histograms page. BUG=43375 TEST=none Review URL: http://codereview.chromium.org/2029004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47843 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/socks_client_socket_pool.cc')
-rw-r--r--net/socket/socks_client_socket_pool.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/socket/socks_client_socket_pool.cc b/net/socket/socks_client_socket_pool.cc
index b98f9fd..452ce25 100644
--- a/net/socket/socks_client_socket_pool.cc
+++ b/net/socket/socks_client_socket_pool.cc
@@ -159,11 +159,11 @@ SOCKSClientSocketPool::SOCKSConnectJobFactory::ConnectionTimeout() const {
SOCKSClientSocketPool::SOCKSClientSocketPool(
int max_sockets,
int max_sockets_per_group,
- const std::string& name,
+ const scoped_refptr<ClientSocketPoolHistograms>& histograms,
const scoped_refptr<HostResolver>& host_resolver,
const scoped_refptr<TCPClientSocketPool>& tcp_pool,
NetworkChangeNotifier* network_change_notifier)
- : base_(max_sockets, max_sockets_per_group, name,
+ : base_(max_sockets, max_sockets_per_group, histograms,
base::TimeDelta::FromSeconds(kUnusedIdleSocketTimeout),
base::TimeDelta::FromSeconds(kUsedIdleSocketTimeout),
new SOCKSConnectJobFactory(tcp_pool, host_resolver),