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

Unified Diff: net/http/http_stream_factory_impl_job.cc

Issue 2895623002: Remove HttpStreamFactoryImpl::Job::ssl_info_. (Closed)
Patch Set: Rebase. Created 3 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/http/http_stream_factory_impl_job.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_stream_factory_impl_job.cc
diff --git a/net/http/http_stream_factory_impl_job.cc b/net/http/http_stream_factory_impl_job.cc
index a5be56bce51b4005ca71d526ce25abc29b46838d..9a666490560dc1fa1f33e6dac44d8541002b58ac 100644
--- a/net/http/http_stream_factory_impl_job.cc
+++ b/net/http/http_stream_factory_impl_job.cc
@@ -387,13 +387,13 @@ void HttpStreamFactoryImpl::Job::LogHistograms() const {
}
}
-void HttpStreamFactoryImpl::Job::GetSSLInfo() {
+void HttpStreamFactoryImpl::Job::GetSSLInfo(SSLInfo* ssl_info) {
DCHECK(using_ssl_);
DCHECK(!establishing_tunnel_);
DCHECK(connection_.get() && connection_->socket());
SSLClientSocket* ssl_socket =
static_cast<SSLClientSocket*>(connection_->socket());
- ssl_socket->GetSSLInfo(&ssl_info_);
+ ssl_socket->GetSSLInfo(ssl_info);
}
SpdySessionKey HttpStreamFactoryImpl::Job::GetSpdySessionKey() const {
@@ -565,13 +565,14 @@ void HttpStreamFactoryImpl::Job::RunLoop(int result) {
if (IsCertificateError(result)) {
// Retrieve SSL information from the socket.
- GetSSLInfo();
+ SSLInfo ssl_info;
+ GetSSLInfo(&ssl_info);
next_state_ = STATE_WAITING_USER_ACTION;
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE,
base::Bind(&HttpStreamFactoryImpl::Job::OnCertificateErrorCallback,
- ptr_factory_.GetWeakPtr(), result, ssl_info_));
+ ptr_factory_.GetWeakPtr(), result, ssl_info));
return;
}
@@ -1370,11 +1371,10 @@ int HttpStreamFactoryImpl::Job::HandleCertificateError(int error) {
DCHECK(using_ssl_);
DCHECK(IsCertificateError(error));
- SSLClientSocket* ssl_socket =
- static_cast<SSLClientSocket*>(connection_->socket());
- ssl_socket->GetSSLInfo(&ssl_info_);
+ SSLInfo ssl_info;
+ GetSSLInfo(&ssl_info);
- if (!ssl_info_.cert) {
+ if (!ssl_info.cert) {
// If the server's certificate could not be parsed, there is no way
// to gracefully recover this, so just pass the error up.
return error;
@@ -1384,13 +1384,13 @@ int HttpStreamFactoryImpl::Job::HandleCertificateError(int error) {
// SSL config object. This data structure will be consulted after calling
// RestartIgnoringLastError(). And the user will be asked interactively
// before RestartIgnoringLastError() is ever called.
- server_ssl_config_.allowed_bad_certs.emplace_back(ssl_info_.cert,
- ssl_info_.cert_status);
+ server_ssl_config_.allowed_bad_certs.emplace_back(ssl_info.cert,
+ ssl_info.cert_status);
int load_flags = request_info_.load_flags;
if (session_->params().ignore_certificate_errors)
load_flags |= LOAD_IGNORE_ALL_CERT_ERRORS;
- if (ssl_socket->IgnoreCertError(error, load_flags))
+ if (SSLClientSocket::IgnoreCertError(error, load_flags))
return OK;
return error;
}
« no previous file with comments | « net/http/http_stream_factory_impl_job.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698