Chromium Code Reviews| Index: net/socket/ssl_client_socket_openssl.cc |
| diff --git a/net/socket/ssl_client_socket_openssl.cc b/net/socket/ssl_client_socket_openssl.cc |
| index 97742bbeec58158690ff3f89d80f31a1a6bf9500..b80e91dd83729f3dba0f3c9459a25ed1322e3b3a 100644 |
| --- a/net/socket/ssl_client_socket_openssl.cc |
| +++ b/net/socket/ssl_client_socket_openssl.cc |
| @@ -394,7 +394,9 @@ void SSLClientSocketOpenSSL::SetIsLeader() { |
| void SSLClientSocketOpenSSL::OnSocketFailure() { |
| if (is_leader_) { |
| - error_callback_.Run(); |
| + // error_callback_ should be run regardless of the validity of this |
| + // SSLClientSocketOpenSSL at the callback's runtime. |
|
Ryan Sleevi
2014/07/10 02:34:25
Note: The request for documentation was meant for
mshelley
2014/07/10 16:35:32
Done.
|
| + base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, error_callback_); |
| error_callback_ = base::Closure(); |
| is_leader_ = false; |
| } |
| @@ -1397,7 +1399,7 @@ void SSLClientSocketOpenSSL::ChannelIDRequestCallback(SSL* ssl, |
| channel_id_cert_.data() + channel_id_cert_.size()); |
| scoped_ptr<crypto::ECPrivateKey> ec_private_key( |
| crypto::ECPrivateKey::CreateFromEncryptedPrivateKeyInfo( |
| - ServerBoundCertService::kEPKIPassword, |
| + SperverBoundCertService::kEPKIPassword, |
| encrypted_private_key_info, |
| subject_public_key_info)); |
| if (!ec_private_key) |