| Index: net/socket/client_socket_factory.cc
|
| diff --git a/net/socket/client_socket_factory.cc b/net/socket/client_socket_factory.cc
|
| index 953914581fc4bd557ae73d7f351065895b4b0fa4..05b169b27ded37dece7669b883c5dce02244ff34 100644
|
| --- a/net/socket/client_socket_factory.cc
|
| +++ b/net/socket/client_socket_factory.cc
|
| @@ -15,6 +15,7 @@
|
| #elif defined(USE_NSS) || defined(OS_MACOSX) || defined(OS_WIN)
|
| #include "net/socket/ssl_client_socket_nss.h"
|
| #endif
|
| +#include "net/socket/ssl_host_info.h"
|
| #include "net/socket/tcp_client_socket.h"
|
| #include "net/udp/udp_client_socket.h"
|
|
|
| @@ -88,7 +89,10 @@ class DefaultClientSocketFactory : public ClientSocketFactory,
|
| scoped_ptr<ClientSocketHandle> transport_socket,
|
| const HostPortPair& host_and_port,
|
| const SSLConfig& ssl_config,
|
| + SSLHostInfo* ssl_host_info,
|
| const SSLClientSocketContext& context) OVERRIDE {
|
| + scoped_ptr<SSLHostInfo> shi(ssl_host_info);
|
| +
|
| // nss_thread_task_runner_ may be NULL if g_use_dedicated_nss_thread is
|
| // false or if the dedicated NSS thread failed to start. If so, cause NSS
|
| // functions to execute on the current task runner.
|
| @@ -113,6 +117,7 @@ class DefaultClientSocketFactory : public ClientSocketFactory,
|
| transport_socket.Pass(),
|
| host_and_port,
|
| ssl_config,
|
| + shi.release(),
|
| context));
|
| #else
|
| NOTIMPLEMENTED();
|
|
|