summaryrefslogtreecommitdiffstats
path: root/net/socket_stream
diff options
context:
space:
mode:
authorszager@chromium.org <szager@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-07 21:27:35 +0000
committerszager@chromium.org <szager@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-07 21:27:35 +0000
commitc2dad2976730464242e1b89edd6db17163a5fa02 (patch)
tree277f0e83c1c28ab371bf696a9d6d46eb5520bfb0 /net/socket_stream
parent28196f11973c0615b3e871a48bb8f8babccd4082 (diff)
downloadchromium_src-c2dad2976730464242e1b89edd6db17163a5fa02.zip
chromium_src-c2dad2976730464242e1b89edd6db17163a5fa02.tar.gz
chromium_src-c2dad2976730464242e1b89edd6db17163a5fa02.tar.bz2
Remove static variables from HttpStreamFactory.
Refresh of issue 10389162. BUG=124900 Review URL: https://chromiumcodereview.appspot.com/10834215 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155485 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket_stream')
-rw-r--r--net/socket_stream/socket_stream.cc9
1 files changed, 6 insertions, 3 deletions
diff --git a/net/socket_stream/socket_stream.cc b/net/socket_stream/socket_stream.cc
index f656cb8..41d77ed 100644
--- a/net/socket_stream/socket_stream.cc
+++ b/net/socket_stream/socket_stream.cc
@@ -1301,9 +1301,12 @@ 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 (SSLClientSocket::IgnoreCertError(result, LOAD_IGNORE_ALL_CERT_ERRORS)) {
+ const HttpNetworkSession::Params* session_params =
+ context_->GetNetworkSessionParams();
+ if (session_params && session_params->ignore_certificate_errors)
+ return OK;
+ }
if (!delegate_)
return result;