Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(35)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/socket/websocket_transport_client_socket_pool_unittest.cc

Issue 1027693004: Delete the ClientSocketPoolHistograms class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: small xml fix Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/socket/websocket_transport_client_socket_pool.cc ('k') | net/websockets/websocket_basic_stream_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/websocket_transport_client_socket_pool_unittest.cc
diff --git a/net/socket/websocket_transport_client_socket_pool_unittest.cc b/net/socket/websocket_transport_client_socket_pool_unittest.cc
index 39fbe3a9d7ceaf547e34e86fc0599b772eaaa80f..55c8f23095be2ad4858e63410b6d0101812ed008 100644
--- a/net/socket/websocket_transport_client_socket_pool_unittest.cc
+++ b/net/socket/websocket_transport_client_socket_pool_unittest.cc
@@ -24,7 +24,6 @@
#include "net/base/test_completion_callback.h"
#include "net/dns/mock_host_resolver.h"
#include "net/socket/client_socket_handle.h"
-#include "net/socket/client_socket_pool_histograms.h"
#include "net/socket/socket_test_util.h"
#include "net/socket/stream_socket.h"
#include "net/socket/transport_client_socket_pool_test_util.h"
@@ -57,12 +56,10 @@ class WebSocketTransportClientSocketPoolTest : public ::testing::Test {
false,
OnHostResolutionCallback(),
TransportSocketParams::COMBINE_CONNECT_AND_WRITE_DEFAULT)),
- histograms_(new ClientSocketPoolHistograms("TCPUnitTest")),
host_resolver_(new MockHostResolver),
client_socket_factory_(&net_log_),
pool_(kMaxSockets,
kMaxSocketsPerGroup,
- histograms_.get(),
host_resolver_.get(),
&client_socket_factory_,
NULL) {}
@@ -108,7 +105,6 @@ class WebSocketTransportClientSocketPoolTest : public ::testing::Test {
CapturingNetLog net_log_;
scoped_refptr<TransportSocketParams> params_;
- scoped_ptr<ClientSocketPoolHistograms> histograms_;
scoped_ptr<MockHostResolver> host_resolver_;
MockTransportClientSocketFactory client_socket_factory_;
WebSocketTransportClientSocketPool pool_;
@@ -565,7 +561,6 @@ TEST_F(WebSocketTransportClientSocketPoolTest,
IPv6FallbackSocketIPv4FinishesFirst) {
WebSocketTransportClientSocketPool pool(kMaxSockets,
kMaxSocketsPerGroup,
- histograms_.get(),
host_resolver_.get(),
&client_socket_factory_,
NULL);
@@ -606,7 +601,6 @@ TEST_F(WebSocketTransportClientSocketPoolTest,
IPv6FallbackSocketIPv6FinishesFirst) {
WebSocketTransportClientSocketPool pool(kMaxSockets,
kMaxSocketsPerGroup,
- histograms_.get(),
host_resolver_.get(),
&client_socket_factory_,
NULL);
@@ -646,7 +640,6 @@ TEST_F(WebSocketTransportClientSocketPoolTest,
IPv6NoIPv4AddressesToFallbackTo) {
WebSocketTransportClientSocketPool pool(kMaxSockets,
kMaxSocketsPerGroup,
- histograms_.get(),
host_resolver_.get(),
&client_socket_factory_,
NULL);
@@ -678,7 +671,6 @@ TEST_F(WebSocketTransportClientSocketPoolTest,
TEST_F(WebSocketTransportClientSocketPoolTest, IPv4HasNoFallback) {
WebSocketTransportClientSocketPool pool(kMaxSockets,
kMaxSocketsPerGroup,
- histograms_.get(),
host_resolver_.get(),
&client_socket_factory_,
NULL);
@@ -711,7 +703,6 @@ TEST_F(WebSocketTransportClientSocketPoolTest, IPv4HasNoFallback) {
TEST_F(WebSocketTransportClientSocketPoolTest, IPv6InstantFail) {
WebSocketTransportClientSocketPool pool(kMaxSockets,
kMaxSocketsPerGroup,
- histograms_.get(),
host_resolver_.get(),
&client_socket_factory_,
NULL);
@@ -748,7 +739,6 @@ TEST_F(WebSocketTransportClientSocketPoolTest, IPv6InstantFail) {
TEST_F(WebSocketTransportClientSocketPoolTest, IPv6RapidFail) {
WebSocketTransportClientSocketPool pool(kMaxSockets,
kMaxSocketsPerGroup,
- histograms_.get(),
host_resolver_.get(),
&client_socket_factory_,
NULL);
@@ -793,7 +783,6 @@ TEST_F(WebSocketTransportClientSocketPoolTest, IPv6RapidFail) {
TEST_F(WebSocketTransportClientSocketPoolTest, FirstSuccessWins) {
WebSocketTransportClientSocketPool pool(kMaxSockets,
kMaxSocketsPerGroup,
- histograms_.get(),
host_resolver_.get(),
&client_socket_factory_,
NULL);
@@ -832,7 +821,6 @@ TEST_F(WebSocketTransportClientSocketPoolTest, FirstSuccessWins) {
TEST_F(WebSocketTransportClientSocketPoolTest, LastFailureWins) {
WebSocketTransportClientSocketPool pool(kMaxSockets,
kMaxSocketsPerGroup,
- histograms_.get(),
host_resolver_.get(),
&client_socket_factory_,
NULL);
@@ -875,7 +863,6 @@ TEST_F(WebSocketTransportClientSocketPoolTest, LastFailureWins) {
TEST_F(WebSocketTransportClientSocketPoolTest, DISABLED_OverallTimeoutApplies) {
WebSocketTransportClientSocketPool pool(kMaxSockets,
kMaxSocketsPerGroup,
- histograms_.get(),
host_resolver_.get(),
&client_socket_factory_,
NULL);
« no previous file with comments | « net/socket/websocket_transport_client_socket_pool.cc ('k') | net/websockets/websocket_basic_stream_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698