| OLD | NEW | 
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #include "jingle/glue/chrome_async_socket.h" | 5 #include "jingle/glue/chrome_async_socket.h" | 
| 6 | 6 | 
| 7 #include <deque> | 7 #include <deque> | 
| 8 #include <string> | 8 #include <string> | 
| 9 | 9 | 
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" | 
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 119         address_list_, NULL, net::NetLog::Source()); | 119         address_list_, NULL, net::NetLog::Source()); | 
| 120   } | 120   } | 
| 121 | 121 | 
| 122   virtual scoped_ptr<net::SSLClientSocket> CreateSSLClientSocket( | 122   virtual scoped_ptr<net::SSLClientSocket> CreateSSLClientSocket( | 
| 123       scoped_ptr<net::ClientSocketHandle> transport_socket, | 123       scoped_ptr<net::ClientSocketHandle> transport_socket, | 
| 124       const net::HostPortPair& host_and_port) OVERRIDE { | 124       const net::HostPortPair& host_and_port) OVERRIDE { | 
| 125     net::SSLClientSocketContext context; | 125     net::SSLClientSocketContext context; | 
| 126     context.cert_verifier = cert_verifier_.get(); | 126     context.cert_verifier = cert_verifier_.get(); | 
| 127     context.transport_security_state = transport_security_state_.get(); | 127     context.transport_security_state = transport_security_state_.get(); | 
| 128     return mock_client_socket_factory_->CreateSSLClientSocket( | 128     return mock_client_socket_factory_->CreateSSLClientSocket( | 
| 129         transport_socket.Pass(), host_and_port, ssl_config_, context); | 129         transport_socket.Pass(), host_and_port, ssl_config_, NULL, context); | 
| 130   } | 130   } | 
| 131 | 131 | 
| 132  private: | 132  private: | 
| 133   scoped_ptr<net::ClientSocketFactory> mock_client_socket_factory_; | 133   scoped_ptr<net::ClientSocketFactory> mock_client_socket_factory_; | 
| 134   net::AddressList address_list_; | 134   net::AddressList address_list_; | 
| 135   net::SSLConfig ssl_config_; | 135   net::SSLConfig ssl_config_; | 
| 136   scoped_ptr<net::CertVerifier> cert_verifier_; | 136   scoped_ptr<net::CertVerifier> cert_verifier_; | 
| 137   scoped_ptr<net::TransportSecurityState> transport_security_state_; | 137   scoped_ptr<net::TransportSecurityState> transport_security_state_; | 
| 138 }; | 138 }; | 
| 139 | 139 | 
| (...skipping 934 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1074   message_loop_.RunUntilIdle(); | 1074   message_loop_.RunUntilIdle(); | 
| 1075 | 1075 | 
| 1076   ExpectNoSignal(); | 1076   ExpectNoSignal(); | 
| 1077 | 1077 | 
| 1078   DoSSLCloseOpenedNoError(); | 1078   DoSSLCloseOpenedNoError(); | 
| 1079 } | 1079 } | 
| 1080 | 1080 | 
| 1081 }  // namespace | 1081 }  // namespace | 
| 1082 | 1082 | 
| 1083 }  // namespace jingle_glue | 1083 }  // namespace jingle_glue | 
| OLD | NEW | 
|---|