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

1 files changed, 12 insertions, 7 deletions

diff --git a/net/socket/socks_client_socket_pool_unittest.cc b/net/socket/socks_client_socket_pool_unittest.cc
index 6072ad3..27cb027 100644
--- a/net/socket/socks_client_socket_pool_unittest.cc
+++ b/net/socket/socks_client_socket_pool_unittest.cc
@@ -15,6 +15,7 @@
 #include "net/base/test_completion_callback.h"
 #include "net/socket/client_socket_factory.h"
 #include "net/socket/client_socket_handle.h"
+#include "net/socket/client_socket_pool_histograms.h"
 #include "net/socket/socket_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -82,10 +83,10 @@ class MockTCPClientSocketPool : public TCPClientSocketPool {
   };
 
   MockTCPClientSocketPool(int max_sockets, int max_sockets_per_group,
-                          const std::string& name,
-                          ClientSocketFactory* socket_factory,
-                          NetworkChangeNotifier* network_change_notifier)
-      : TCPClientSocketPool(max_sockets, max_sockets_per_group, name,
+      const scoped_refptr<ClientSocketPoolHistograms>& histograms,
+      ClientSocketFactory* socket_factory,
+      NetworkChangeNotifier* network_change_notifier)
+      : TCPClientSocketPool(max_sockets, max_sockets_per_group, histograms,
                             NULL, NULL, network_change_notifier),
         client_socket_factory_(socket_factory),
         release_count_(0),
@@ -169,15 +170,17 @@ class SOCKSClientSocketPoolTest : public ClientSocketPoolTest {
   SOCKSClientSocketPoolTest()
       : ignored_tcp_socket_params_(
             HostPortPair("proxy", 80), MEDIUM, GURL(), false),
+        tcp_histograms_(new ClientSocketPoolHistograms("MockTCP")),
         tcp_socket_pool_(new MockTCPClientSocketPool(
-            kMaxSockets, kMaxSocketsPerGroup, "MockTCP",
+            kMaxSockets, kMaxSocketsPerGroup, tcp_histograms_,
             &tcp_client_socket_factory_, &tcp_notifier_)),
         ignored_socket_params_(ignored_tcp_socket_params_, true,
                                HostPortPair("host", 80),
                                MEDIUM, GURL()),
+        socks_histograms_(new ClientSocketPoolHistograms("SOCKSUnitTest")),
         pool_(new SOCKSClientSocketPool(
-            kMaxSockets, kMaxSocketsPerGroup, "SOCKSUnitTest", NULL,
-            tcp_socket_pool_.get(), &socks_notifier_)) {
+            kMaxSockets, kMaxSocketsPerGroup, socks_histograms_, NULL,
+            tcp_socket_pool_, &socks_notifier_)) {
   }
 
   int StartRequest(const std::string& group_name, RequestPriority priority) {
@@ -186,11 +189,13 @@ class SOCKSClientSocketPoolTest : public ClientSocketPoolTest {
   }
 
   TCPSocketParams ignored_tcp_socket_params_;
+  scoped_refptr<ClientSocketPoolHistograms> tcp_histograms_;
   MockClientSocketFactory tcp_client_socket_factory_;
   MockNetworkChangeNotifier tcp_notifier_;
   scoped_refptr<MockTCPClientSocketPool> tcp_socket_pool_;
 
   SOCKSSocketParams ignored_socket_params_;
+  scoped_refptr<ClientSocketPoolHistograms> socks_histograms_;
   MockNetworkChangeNotifier socks_notifier_;
   scoped_refptr<SOCKSClientSocketPool> pool_;
 };