From b89f7e4d3f98fffe88bd07a57c735e28c37e692c Mon Sep 17 00:00:00 2001 From: "vandebo@chromium.org" Date: Thu, 20 May 2010 20:37:00 +0000 Subject: 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 --- net/socket/tcp_client_socket_pool.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'net/socket/tcp_client_socket_pool.h') diff --git a/net/socket/tcp_client_socket_pool.h b/net/socket/tcp_client_socket_pool.h index 30158f6..355bd2a 100644 --- a/net/socket/tcp_client_socket_pool.h +++ b/net/socket/tcp_client_socket_pool.h @@ -15,6 +15,7 @@ #include "net/base/host_port_pair.h" #include "net/base/host_resolver.h" #include "net/socket/client_socket_pool_base.h" +#include "net/socket/client_socket_pool_histograms.h" #include "net/socket/client_socket_pool.h" namespace net { @@ -114,7 +115,7 @@ class TCPClientSocketPool : public ClientSocketPool { TCPClientSocketPool( int max_sockets, int max_sockets_per_group, - const std::string& name, + const scoped_refptr& histograms, HostResolver* host_resolver, ClientSocketFactory* client_socket_factory, NetworkChangeNotifier* network_change_notifier); @@ -149,7 +150,9 @@ class TCPClientSocketPool : public ClientSocketPool { return base_.ConnectionTimeout(); } - virtual const std::string& name() const { return base_.name(); } + virtual scoped_refptr histograms() const { + return base_.histograms(); + } protected: virtual ~TCPClientSocketPool(); -- cgit v1.1