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) |
@@ -23,6 +23,9 @@ |
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStreamComponent.h" |
#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) |
Ryan Sleevi
2012/10/11 00:26:06
nit: linebreak between lines 25 and 26 ( http://de
Ronghua Wu (Left Chromium)
2012/10/11 00:34:30
Done.
|
+#include "net/socket/nss_ssl_util.h" |
+#endif |
class P2PPortAllocatorFactory : public webrtc::PortAllocatorFactoryInterface { |
public: |
@@ -352,6 +355,11 @@ |
new content::IpcPacketSocketFactory(p2p_socket_dispatcher_)); |
} |
+#if !defined(USE_OPENSSL) |
+ // Init NSS which will be needed by PeerConnection |
Ryan Sleevi
2012/10/11 00:26:06
nit: add comma
// Init NSS, which is used by Peer
Ronghua Wu (Left Chromium)
2012/10/11 00:34:30
Done.
|
+ net::EnsureNSSSSLInit(); |
+#endif |
+ |
if (!CreatePeerConnectionFactory()) { |
LOG(ERROR) << "Could not create PeerConnection factory"; |
return false; |