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

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
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;

Powered by Google App Engine
This is Rietveld 408576698