Index: content/renderer/media/media_stream_dependency_factory.cc |
=================================================================== |
--- content/renderer/media/media_stream_dependency_factory.cc (revision 160712) |
+++ content/renderer/media/media_stream_dependency_factory.cc (working copy) |
@@ -24,6 +24,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_NSS) |
wtc
2012/10/11 18:22:16
The two ifdefs you added should be either
#if !
ekr
2012/10/11 18:29:49
I wonder if what you want is SSL_USE_OPENSSL and S
Ronghua Wu (Left Chromium)
2012/10/11 21:13:53
Done.
|
+#include "net/socket/nss_ssl_util.h" |
+#endif |
+ |
class P2PPortAllocatorFactory : public webrtc::PortAllocatorFactoryInterface { |
public: |
P2PPortAllocatorFactory( |
@@ -352,6 +356,11 @@ |
new content::IpcPacketSocketFactory(p2p_socket_dispatcher_)); |
} |
+#if defined(USE_NSS) |
+ // Init NSS, which will be needed by PeerConnection. |
+ net::EnsureNSSSSLInit(); |
+#endif |
+ |
if (!CreatePeerConnectionFactory()) { |
LOG(ERROR) << "Could not create PeerConnection factory"; |
return false; |