diff options
| author | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-02 19:02:38 +0000 |
|---|---|---|
| committer | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-02 19:02:38 +0000 |
| commit | 616925a61dcb63847f31809a1061d85fac9b57e6 (patch) | |
| tree | 4b077aea53dd99027aec6e9a23dd84a9d7a6fcc6 /net/socket | |
| parent | b13e83a45074b6ce821440ef480a6cc6d075731c (diff) | |
| download | chromium_src-616925a61dcb63847f31809a1061d85fac9b57e6.zip chromium_src-616925a61dcb63847f31809a1061d85fac9b57e6.tar.gz chromium_src-616925a61dcb63847f31809a1061d85fac9b57e6.tar.bz2 | |
Remove connection failed histograms.
BUG=none - not used and blocks refactoring for bug 30357
TEST=unit tests
Review URL: http://codereview.chromium.org/661318
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40397 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket')
| -rw-r--r-- | net/socket/client_socket_pool_base.cc | 4 | ||||
| -rw-r--r-- | net/socket/ssl_client_socket_win.cc | 17 | ||||
| -rw-r--r-- | net/socket/ssl_client_socket_win.h | 2 | ||||
| -rw-r--r-- | net/socket/tcp_client_socket_win.cc | 6 |
4 files changed, 16 insertions, 13 deletions
diff --git a/net/socket/client_socket_pool_base.cc b/net/socket/client_socket_pool_base.cc index ed188fd..c6d9493 100644 --- a/net/socket/client_socket_pool_base.cc +++ b/net/socket/client_socket_pool_base.cc @@ -426,14 +426,14 @@ void ClientSocketPoolBaseHelper::DoReleaseSocket(const std::string& group_name, // We can't activate more sockets since we're already at our global limit. if (ReachedMaxSocketsLimit()) return; - + // |group| might now be deleted. i = group_map_.find(group_name); if (i == group_map_.end()) return; group = i->second; - + // If we already have enough ConnectJobs to satisfy the pending requests, // don't bother starting up more. if (group.pending_requests.size() <= group.jobs.size()) diff --git a/net/socket/ssl_client_socket_win.cc b/net/socket/ssl_client_socket_win.cc index 5d464b5..ab3bca8 100644 --- a/net/socket/ssl_client_socket_win.cc +++ b/net/socket/ssl_client_socket_win.cc @@ -985,7 +985,8 @@ int SSLClientSocketWin::DoVerifyCertComplete(int result) { ssl_config_.IsAllowedBadCert(server_cert_)) result = OK; - LogConnectionTypeMetrics(result >= 0); + if (result == OK) + LogConnectionTypeMetrics(); if (renegotiating_) { DidCompleteRenegotiation(); return result; @@ -1325,18 +1326,18 @@ void SSLClientSocketWin::DidCompleteRenegotiation() { next_state_ = STATE_COMPLETED_RENEGOTIATION; } -void SSLClientSocketWin::LogConnectionTypeMetrics(bool success) const { - UpdateConnectionTypeHistograms(CONNECTION_SSL, success); +void SSLClientSocketWin::LogConnectionTypeMetrics() const { + UpdateConnectionTypeHistograms(CONNECTION_SSL); if (server_cert_verify_result_.has_md5) - UpdateConnectionTypeHistograms(CONNECTION_SSL_MD5, success); + UpdateConnectionTypeHistograms(CONNECTION_SSL_MD5); if (server_cert_verify_result_.has_md2) - UpdateConnectionTypeHistograms(CONNECTION_SSL_MD2, success); + UpdateConnectionTypeHistograms(CONNECTION_SSL_MD2); if (server_cert_verify_result_.has_md4) - UpdateConnectionTypeHistograms(CONNECTION_SSL_MD4, success); + UpdateConnectionTypeHistograms(CONNECTION_SSL_MD4); if (server_cert_verify_result_.has_md5_ca) - UpdateConnectionTypeHistograms(CONNECTION_SSL_MD5_CA, success); + UpdateConnectionTypeHistograms(CONNECTION_SSL_MD5_CA); if (server_cert_verify_result_.has_md2_ca) - UpdateConnectionTypeHistograms(CONNECTION_SSL_MD2_CA, success); + UpdateConnectionTypeHistograms(CONNECTION_SSL_MD2_CA); } void SSLClientSocketWin::FreeSendBuffer() { diff --git a/net/socket/ssl_client_socket_win.h b/net/socket/ssl_client_socket_win.h index 1321c00..84a42de 100644 --- a/net/socket/ssl_client_socket_win.h +++ b/net/socket/ssl_client_socket_win.h @@ -86,7 +86,7 @@ class SSLClientSocketWin : public SSLClientSocket { int DidCallInitializeSecurityContext(); int DidCompleteHandshake(); void DidCompleteRenegotiation(); - void LogConnectionTypeMetrics(bool success) const; + void LogConnectionTypeMetrics() const; void FreeSendBuffer(); // Internal callbacks as async operations complete. diff --git a/net/socket/tcp_client_socket_win.cc b/net/socket/tcp_client_socket_win.cc index 1f13d9f..1ec8b28 100644 --- a/net/socket/tcp_client_socket_win.cc +++ b/net/socket/tcp_client_socket_win.cc @@ -314,7 +314,8 @@ int TCPClientSocketWin::Connect(CompletionCallback* callback, } else { TRACE_EVENT_END("socket.connect", this, ""); LoadLog::EndEvent(load_log, LoadLog::TYPE_TCP_CONNECT); - UpdateConnectionTypeHistograms(CONNECTION_ANY, rv >= 0); + if (rv == OK) + UpdateConnectionTypeHistograms(CONNECTION_ANY); } return rv; @@ -677,7 +678,8 @@ void TCPClientSocketWin::DidCompleteConnect() { } if (result != ERR_IO_PENDING) { - UpdateConnectionTypeHistograms(CONNECTION_ANY, result >= 0); + if (result == OK) + UpdateConnectionTypeHistograms(CONNECTION_ANY); DoReadCallback(result); } } |