| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "net/socket/ssl_client_socket_pool.h" | 5 #include "net/socket/ssl_client_socket_pool.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
| 9 #include "base/metrics/field_trial.h" | 9 #include "base/metrics/field_trial.h" |
| 10 #include "base/metrics/histogram_macros.h" | 10 #include "base/metrics/histogram_macros.h" |
| (...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 411 "Full_Handshake", | 411 "Full_Handshake", |
| 412 connect_duration, | 412 connect_duration, |
| 413 base::TimeDelta::FromMilliseconds(1), | 413 base::TimeDelta::FromMilliseconds(1), |
| 414 base::TimeDelta::FromMinutes(1), | 414 base::TimeDelta::FromMinutes(1), |
| 415 100); | 415 100); |
| 416 } | 416 } |
| 417 } | 417 } |
| 418 } | 418 } |
| 419 | 419 |
| 420 UMA_HISTOGRAM_SPARSE_SLOWLY("Net.SSL_Connection_Error", std::abs(result)); | 420 UMA_HISTOGRAM_SPARSE_SLOWLY("Net.SSL_Connection_Error", std::abs(result)); |
| 421 if (params_->ssl_config().fastradio_padding_eligible) { | |
| 422 UMA_HISTOGRAM_SPARSE_SLOWLY("Net.SSL_Connection_Error_FastRadioPadding", | |
| 423 std::abs(result)); | |
| 424 } | |
| 425 | 421 |
| 426 if (result == OK || IsCertificateError(result)) { | 422 if (result == OK || IsCertificateError(result)) { |
| 427 SetSocket(ssl_socket_.Pass()); | 423 SetSocket(ssl_socket_.Pass()); |
| 428 } else if (result == ERR_SSL_CLIENT_AUTH_CERT_NEEDED) { | 424 } else if (result == ERR_SSL_CLIENT_AUTH_CERT_NEEDED) { |
| 429 error_response_info_.cert_request_info = new SSLCertRequestInfo; | 425 error_response_info_.cert_request_info = new SSLCertRequestInfo; |
| 430 ssl_socket_->GetSSLCertRequestInfo( | 426 ssl_socket_->GetSSLCertRequestInfo( |
| 431 error_response_info_.cert_request_info.get()); | 427 error_response_info_.cert_request_info.get()); |
| 432 } | 428 } |
| 433 | 429 |
| 434 return result; | 430 return result; |
| (...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 665 if (base_.CloseOneIdleSocket()) | 661 if (base_.CloseOneIdleSocket()) |
| 666 return true; | 662 return true; |
| 667 return base_.CloseOneIdleConnectionInHigherLayeredPool(); | 663 return base_.CloseOneIdleConnectionInHigherLayeredPool(); |
| 668 } | 664 } |
| 669 | 665 |
| 670 void SSLClientSocketPool::OnSSLConfigChanged() { | 666 void SSLClientSocketPool::OnSSLConfigChanged() { |
| 671 FlushWithError(ERR_NETWORK_CHANGED); | 667 FlushWithError(ERR_NETWORK_CHANGED); |
| 672 } | 668 } |
| 673 | 669 |
| 674 } // namespace net | 670 } // namespace net |
| OLD | NEW |