diff options
| author | Zeno Albisser <zeno.albisser@digia.com> | 2013-11-21 14:09:57 +0100 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2013-11-29 15:14:36 +0100 |
| commit | eb32ba6f51d0c21d58cd7d89785285ff8fa64624 (patch) | |
| tree | 2c7c940e1dbee81b89d935626110816b494aa32c /chromium/net/socket/ssl_server_socket_nss.cc | |
| parent | 9427c1a0222ebd67efef1a2c7990a0fa5c9aac84 (diff) | |
| download | qtwebengine-chromium-eb32ba6f51d0c21d58cd7d89785285ff8fa64624.tar.gz | |
Update chromium to branch 1599.
Change-Id: I04e775a946a208bb4500d3b722bcb05c82b9d7cb
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'chromium/net/socket/ssl_server_socket_nss.cc')
| -rw-r--r-- | chromium/net/socket/ssl_server_socket_nss.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/chromium/net/socket/ssl_server_socket_nss.cc b/chromium/net/socket/ssl_server_socket_nss.cc index 7e5d70118ac..c2681d3ee14 100644 --- a/chromium/net/socket/ssl_server_socket_nss.cc +++ b/chromium/net/socket/ssl_server_socket_nss.cc @@ -78,20 +78,19 @@ void EnableSSLServerSockets() { g_nss_ssl_server_init_singleton.Get(); } -scoped_ptr<SSLServerSocket> CreateSSLServerSocket( - scoped_ptr<StreamSocket> socket, +SSLServerSocket* CreateSSLServerSocket( + StreamSocket* socket, X509Certificate* cert, crypto::RSAPrivateKey* key, const SSLConfig& ssl_config) { DCHECK(g_nss_server_sockets_init) << "EnableSSLServerSockets() has not been" << "called yet!"; - return scoped_ptr<SSLServerSocket>( - new SSLServerSocketNSS(socket.Pass(), cert, key, ssl_config)); + return new SSLServerSocketNSS(socket, cert, key, ssl_config); } SSLServerSocketNSS::SSLServerSocketNSS( - scoped_ptr<StreamSocket> transport_socket, + StreamSocket* transport_socket, scoped_refptr<X509Certificate> cert, crypto::RSAPrivateKey* key, const SSLConfig& ssl_config) @@ -101,7 +100,7 @@ SSLServerSocketNSS::SSLServerSocketNSS( user_write_buf_len_(0), nss_fd_(NULL), nss_bufs_(NULL), - transport_socket_(transport_socket.Pass()), + transport_socket_(transport_socket), ssl_config_(ssl_config), cert_(cert), next_handshake_state_(STATE_NONE), |