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) |
@@ -19,6 +19,7 @@ |
#include "content/renderer/p2p/ipc_socket_factory.h" |
#include "content/renderer/p2p/port_allocator.h" |
#include "jingle/glue/thread_wrapper.h" |
+#include "net/socket/nss_ssl_util.h" |
Ryan Sleevi
2012/10/10 23:59:15
#if !defined(USE_OPENSSL)
#include "net/socket/nss
Ronghua Wu (Left Chromium)
2012/10/11 00:17:18
Done.
|
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStreamComponent.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStreamDescriptor.h" |
@@ -352,10 +353,14 @@ |
new content::IpcPacketSocketFactory(p2p_socket_dispatcher_)); |
} |
+ // Init NSS which will be needed by PeerConnection. |
ekr
2012/10/10 23:48:34
I may have lost the thread but I thought we needed
Ronghua Wu (Left Chromium)
2012/10/11 00:17:18
Last reply from Ryan seems to say the ForceNSSNoDB
Ryan Sleevi
2012/10/11 00:26:06
No, you are correct, it is not needed.
If/when it
|
+ net::EnsureNSSSSLInit(); |
Sergey Ulanov
2012/10/10 23:59:01
NSS is initialized in ChromeRenderProcessObserver:
Ryan Sleevi
2012/10/10 23:59:15
#if !defined(USE_OPENSSL)
// Init NSS which will b
Ronghua Wu (Left Chromium)
2012/10/11 00:17:18
Done.
|
+ |
if (!CreatePeerConnectionFactory()) { |
LOG(ERROR) << "Could not create PeerConnection factory"; |
return false; |
} |
+ |
ekr
2012/10/10 23:48:34
Whitespace only change.
Ronghua Wu (Left Chromium)
2012/10/11 00:17:18
Done.
|
return true; |
} |