diff options
| author | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-20 20:37:00 +0000 |
|---|---|---|
| committer | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-20 20:37:00 +0000 |
| commit | b89f7e4d3f98fffe88bd07a57c735e28c37e692c (patch) | |
| tree | fb0e304d16190673073e62a44a4ef0103ca48876 /net/socket/tcp_client_socket_pool_unittest.cc | |
| parent | b846407ff810e7cfb21642803bd00ed4d4883dc3 (diff) | |
| download | chromium_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/tcp_client_socket_pool_unittest.cc')
| -rw-r--r-- | net/socket/tcp_client_socket_pool_unittest.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/socket/tcp_client_socket_pool_unittest.cc b/net/socket/tcp_client_socket_pool_unittest.cc index e6d435a..e0dc09f 100644 --- a/net/socket/tcp_client_socket_pool_unittest.cc +++ b/net/socket/tcp_client_socket_pool_unittest.cc @@ -14,6 +14,7 @@ #include "net/socket/client_socket.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" @@ -264,10 +265,11 @@ class TCPClientSocketPoolTest : public ClientSocketPoolTest { TCPClientSocketPoolTest() : ignored_socket_params_( HostPortPair("ignored", 80), MEDIUM, GURL(), false), + histograms_(new ClientSocketPoolHistograms("TCPUnitTest")), host_resolver_(new MockHostResolver), pool_(new TCPClientSocketPool(kMaxSockets, kMaxSocketsPerGroup, - "TCPUnitTest", + histograms_, host_resolver_, &client_socket_factory_, ¬ifier_)) { @@ -279,6 +281,7 @@ class TCPClientSocketPoolTest : public ClientSocketPoolTest { } TCPSocketParams ignored_socket_params_; + scoped_refptr<ClientSocketPoolHistograms> histograms_; scoped_refptr<MockHostResolver> host_resolver_; MockClientSocketFactory client_socket_factory_; MockNetworkChangeNotifier notifier_; @@ -740,7 +743,7 @@ TEST_F(TCPClientSocketPoolTest, BackupSocketConnect) { pool_ = new TCPClientSocketPool(kMaxSockets, kMaxSocketsPerGroup, - "TCPUnitTest", + histograms_, host_resolver_, &client_socket_factory_, NULL); |