Index: net/socket_stream/socket_stream.cc |
diff --git a/net/socket_stream/socket_stream.cc b/net/socket_stream/socket_stream.cc |
index f656cb8b94ab447a84114c8d2f0fe72b1d70ed19..d40af4d242822ae9fc90aa34209d491ad828db4b 100644 |
--- a/net/socket_stream/socket_stream.cc |
+++ b/net/socket_stream/socket_stream.cc |
@@ -1301,9 +1301,14 @@ int SocketStream::HandleCertificateError(int result) { |
SSLClientSocket* ssl_socket = static_cast<SSLClientSocket*>(socket_.get()); |
DCHECK(ssl_socket); |
- if (HttpStreamFactory::ignore_certificate_errors() && |
- ssl_socket->IgnoreCertError(result, LOAD_IGNORE_ALL_CERT_ERRORS)) |
- return OK; |
+ if (ssl_socket->IgnoreCertError(result, LOAD_IGNORE_ALL_CERT_ERRORS)) { |
mmenke
2012/08/23 18:11:28
Could you switch this to SSLClientSocket::IgnoreCe
|
+ HttpTransactionFactory* factory = context_->http_transaction_factory(); |
+ if (factory) { |
+ scoped_refptr<HttpNetworkSession> session = factory->GetSession(); |
+ if (session.get() && session->params().ignore_certificate_errors) |
+ return OK; |
+ } |
+ } |
if (!delegate_) |
return result; |