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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/socket_stream/socket_stream.cc

Issue 10834215: Remove static variables from HttpStreamFactory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: syntax error Created 8 years, 4 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/socket/client_socket_pool_manager.cc ('k') | net/url_request/url_request_context.h » ('j') | net/url_request/url_request_context.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..a28a37c958d21a38ccdbd9e8bdd9feb76d79055c 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 (SSLClientSocket::IgnoreCertError(result, LOAD_IGNORE_ALL_CERT_ERRORS)) {
+ HttpTransactionFactory* factory = context_->http_transaction_factory();
mmenke 2012/09/04 17:43:13 GetReferenceParams?
szager1 2012/09/04 19:31:07 Done.
+ if (factory) {
+ HttpNetworkSession* session = factory->GetSession();
+ if (session && session->params().ignore_certificate_errors)
+ return OK;
+ }
+ }
if (!delegate_)
return result;
« no previous file with comments | « net/socket/client_socket_pool_manager.cc ('k') | net/url_request/url_request_context.h » ('j') | net/url_request/url_request_context.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698