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.h" | 10 #include "base/metrics/histogram.h" |
(...skipping 534 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
545 "Full_Handshake", | 545 "Full_Handshake", |
546 connect_duration, | 546 connect_duration, |
547 base::TimeDelta::FromMilliseconds(1), | 547 base::TimeDelta::FromMilliseconds(1), |
548 base::TimeDelta::FromMinutes(1), | 548 base::TimeDelta::FromMinutes(1), |
549 100); | 549 100); |
550 } | 550 } |
551 } | 551 } |
552 } | 552 } |
553 | 553 |
554 if (result == OK || IsCertificateError(result)) { | 554 if (result == OK || IsCertificateError(result)) { |
555 SetSocket(ssl_socket_.PassAs<StreamSocket>()); | 555 SetSocket(ssl_socket_.Pass()); |
556 } else if (result == ERR_SSL_CLIENT_AUTH_CERT_NEEDED) { | 556 } else if (result == ERR_SSL_CLIENT_AUTH_CERT_NEEDED) { |
557 error_response_info_.cert_request_info = new SSLCertRequestInfo; | 557 error_response_info_.cert_request_info = new SSLCertRequestInfo; |
558 ssl_socket_->GetSSLCertRequestInfo( | 558 ssl_socket_->GetSSLCertRequestInfo( |
559 error_response_info_.cert_request_info.get()); | 559 error_response_info_.cert_request_info.get()); |
560 } | 560 } |
561 | 561 |
562 return result; | 562 return result; |
563 } | 563 } |
564 | 564 |
565 void SSLConnectJob::ResumeSSLConnection() { | 565 void SSLConnectJob::ResumeSSLConnection() { |
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
844 CHECK(it != messenger_map_.end()); | 844 CHECK(it != messenger_map_.end()); |
845 delete it->second; | 845 delete it->second; |
846 messenger_map_.erase(it); | 846 messenger_map_.erase(it); |
847 } | 847 } |
848 | 848 |
849 void SSLClientSocketPool::OnSSLConfigChanged() { | 849 void SSLClientSocketPool::OnSSLConfigChanged() { |
850 FlushWithError(ERR_NETWORK_CHANGED); | 850 FlushWithError(ERR_NETWORK_CHANGED); |
851 } | 851 } |
852 | 852 |
853 } // namespace net | 853 } // namespace net |
OLD | NEW |