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

Side by Side Diff: net/socket/ssl_client_socket_pool.cc

Issue 935333002: Update from https://crrev.com/316786 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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 unified diff | Download patch
« no previous file with comments | « net/socket/ssl_client_socket_openssl.cc ('k') | net/socket/tcp_socket_libevent.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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.h" 10 #include "base/metrics/histogram.h"
(...skipping 534 matching lines...) Expand 10 before | Expand all | Expand 10 after
545 UMA_HISTOGRAM_CUSTOM_TIMES("Net.SSL_Connection_Latency_Google_" 545 UMA_HISTOGRAM_CUSTOM_TIMES("Net.SSL_Connection_Latency_Google_"
546 "Full_Handshake", 546 "Full_Handshake",
547 connect_duration, 547 connect_duration,
548 base::TimeDelta::FromMilliseconds(1), 548 base::TimeDelta::FromMilliseconds(1),
549 base::TimeDelta::FromMinutes(1), 549 base::TimeDelta::FromMinutes(1),
550 100); 550 100);
551 } 551 }
552 } 552 }
553 } 553 }
554 554
555 UMA_HISTOGRAM_SPARSE_SLOWLY("Net.SSL_Connection_Error", std::abs(result));
556 if (params_->ssl_config().fastradio_padding_eligible) {
557 UMA_HISTOGRAM_SPARSE_SLOWLY("Net.SSL_Connection_Error_FastRadioPadding",
558 std::abs(result));
559 }
560
555 if (result == OK || IsCertificateError(result)) { 561 if (result == OK || IsCertificateError(result)) {
556 SetSocket(ssl_socket_.Pass()); 562 SetSocket(ssl_socket_.Pass());
557 } else if (result == ERR_SSL_CLIENT_AUTH_CERT_NEEDED) { 563 } else if (result == ERR_SSL_CLIENT_AUTH_CERT_NEEDED) {
558 error_response_info_.cert_request_info = new SSLCertRequestInfo; 564 error_response_info_.cert_request_info = new SSLCertRequestInfo;
559 ssl_socket_->GetSSLCertRequestInfo( 565 ssl_socket_->GetSSLCertRequestInfo(
560 error_response_info_.cert_request_info.get()); 566 error_response_info_.cert_request_info.get());
561 } 567 }
562 568
563 return result; 569 return result;
564 } 570 }
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after
842 CHECK(it != messenger_map_.end()); 848 CHECK(it != messenger_map_.end());
843 delete it->second; 849 delete it->second;
844 messenger_map_.erase(it); 850 messenger_map_.erase(it);
845 } 851 }
846 852
847 void SSLClientSocketPool::OnSSLConfigChanged() { 853 void SSLClientSocketPool::OnSSLConfigChanged() {
848 FlushWithError(ERR_NETWORK_CHANGED); 854 FlushWithError(ERR_NETWORK_CHANGED);
849 } 855 }
850 856
851 } // namespace net 857 } // namespace net
OLDNEW
« no previous file with comments | « net/socket/ssl_client_socket_openssl.cc ('k') | net/socket/tcp_socket_libevent.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698