Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(76)

Unified Diff: content/renderer/media/media_stream_dependency_factory.cc

Issue 11093061: Enable peerconnection to use the NSS RNG. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/content_renderer.gypi ('k') | remoting/remoting.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « content/content_renderer.gypi ('k') | remoting/remoting.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698