Merge 162055 - Enable peerconnection to use the NSS RNG.

content/renderer/media/media_stream_dependency_factory.cc

Index: content/renderer/media/media_stream_dependency_factory.cc
===================================================================
--- content/renderer/media/media_stream_dependency_factory.cc	(revision 162734)
+++ content/renderer/media/media_stream_dependency_factory.cc	(working copy)
@@ -25,6 +25,10 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStreamDescriptor.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStreamSource.h"
 
+#if !defined(USE_OPENSSL)
+#include "net/socket/nss_ssl_util.h"
+#endif
+
 class P2PPortAllocatorFactory : public webrtc::PortAllocatorFactoryInterface {
  public:
   P2PPortAllocatorFactory(
@@ -338,6 +342,11 @@
         new content::IpcPacketSocketFactory(p2p_socket_dispatcher_));
   }
 
+#if !defined(USE_OPENSSL)
+  // Init NSS, which will be needed by PeerConnection.
+  net::EnsureNSSSSLInit();
+#endif
+
   if (!CreatePeerConnectionFactory(
       worker_thread_,
       signaling_thread_,