Remove static variables from HttpStreamFactory.

net/socket_stream/socket_stream.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // TODO(ukai): code is similar with http_network_transaction.cc.  We should
 //   think about ways to share code, if possible.
 
 #include "net/socket_stream/socket_stream.h"
 
 #include <set>
@@ skipping 1283 matching lines @@
 
   next_state_ = STATE_TCP_CONNECT;
   DoLoop(OK);
 }
 
 int SocketStream::HandleCertificateError(int result) {
   DCHECK(IsCertificateError(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;
 
   SSLInfo ssl_info;
   ssl_socket->GetSSLInfo(&ssl_info);
 
   TransportSecurityState::DomainState domain_state;
   DCHECK(context_);
   const bool fatal =
       context_->transport_security_state() &&
       context_->transport_security_state()->GetDomainState(
           url_.host(),
           SSLConfigService::IsSNIAvailable(context_->ssl_config_service()),
           &domain_state);
 
   delegate_->OnSSLCertificateError(this, ssl_info, fatal);
   return ERR_IO_PENDING;
 }
 
 SSLConfigService* SocketStream::ssl_config_service() const {
   return context_->ssl_config_service();
 }
 
 ProxyService* SocketStream::proxy_service() const {
   return context_->proxy_service();
 }
 
 }  // namespace net