Index: net/test/embedded_test_server/embedded_test_server.cc |
diff --git a/net/test/embedded_test_server/embedded_test_server.cc b/net/test/embedded_test_server/embedded_test_server.cc |
index 8f10e1ca301bf55318704d7bb147bc80db2690d6..49fcf67eac3ed782d04b7862a97acffae0bf3855 100644 |
--- a/net/test/embedded_test_server/embedded_test_server.cc |
+++ b/net/test/embedded_test_server/embedded_test_server.cc |
@@ -292,8 +292,10 @@ scoped_ptr<StreamSocket> EmbeddedTestServer::DoSSLUpgrade( |
scoped_ptr<crypto::RSAPrivateKey> server_key( |
crypto::RSAPrivateKey::CreateFromPrivateKeyInfo(key_vector)); |
- return CreateSSLServerSocket(std::move(connection), GetCertificate().get(), |
- *server_key, ssl_config_); |
+ scoped_ptr<SSLServerSocketContext> context = CreateSSLServerSocketContext( |
+ GetCertificate().get(), *server_key, ssl_config_); |
+ |
+ return context->CreateSSLServerSocket(std::move(connection)); |
davidben
2016/01/22 23:57:48
The socket should not outlive the context, nor sho
ryanchung
2016/01/29 23:28:16
I moved the context creation to InitializeAndListe
|
} |
void EmbeddedTestServer::DoAcceptLoop() { |