Add an explicit function to init NSS for SSL server sockets

net/socket/nss_ssl_util_internal.h

Index: net/socket/nss_ssl_util_internal.h
diff --git a/net/socket/nss_ssl_util.h b/net/socket/nss_ssl_util_internal.h
similarity index 72%
copy from net/socket/nss_ssl_util.h
copy to net/socket/nss_ssl_util_internal.h
index 6c956610218ae91225ef20548e6f3b8134a3c5f0..c3bc774143f034132e480e0fb4d62bbd1c8ab3a8 100644
--- a/net/socket/nss_ssl_util.h
+++ b/net/socket/nss_ssl_util_internal.h
@@ -5,18 +5,18 @@
 // This file is only included in ssl_client_socket_nss.cc and
 // ssl_server_socket_nss.cc to share common functions of NSS.
 
-#ifndef NET_SOCKET_NSS_SSL_UTIL_H_
-#define NET_SOCKET_NSS_SSL_UTIL_H_
+#ifndef NET_SOCKET_NSS_SSL_UTIL_INTERNAL_H_
+#define NET_SOCKET_NSS_SSL_UTIL_INTERNAL_H_
 
 #include <prerror.h>
 
+// These functions return a type defined in an NSS header, and so cannot be
+// declared in nss_util.h.  Hence, they are declared here.

[wtc, 2012/06/12 18:27:38]

nss_util.h => nss_ssl_util.h

+
 namespace net {
 
 class BoundNetLog;
 
-// Initalize NSS SSL library.
-void EnsureNSSSSLInit();
-
 // Log a failed NSS funcion call.
 void LogFailedNSSFunction(const BoundNetLog& net_log,
                           const char* function,
@@ -30,4 +30,4 @@ int MapNSSError(PRErrorCode err);
 
 }  // namespace net
 
-#endif  // NET_SOCKET_NSS_SSL_UTIL_H_
+#endif  // NET_SOCKET_NSS_SSL_UTIL_INTERNAL_H_