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

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

Issue 22640017: Passing NULL PeerConnectionIdentityService to Libjingle when Chrome is using openssl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 4 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 | « no previous file | no next file » | 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
diff --git a/content/renderer/media/media_stream_dependency_factory.cc b/content/renderer/media/media_stream_dependency_factory.cc
index 7f5e64aa187ffe65a2b1995e102f5a64b5809aef..8267a07fd1dc1776c2f7561fadea4a0171f2a0f5 100644
--- a/content/renderer/media/media_stream_dependency_factory.cc
+++ b/content/renderer/media/media_stream_dependency_factory.cc
@@ -550,9 +550,16 @@ MediaStreamDependencyFactory::CreatePeerConnection(
socket_factory_.get(),
web_frame);
+// The crypto APIs needed for generating identities are not implenented for
+// OPENSSL yet. So passing NULL to let Libjingle generate its own.
+// TODO(jiayl): remove the #if once the crypto APIs are implemented for OPENSSL.
PeerConnectionIdentityService* identity_service =
+#if !defined(USE_OPENSSL)
Ami GONE FROM CHROMIUM 2013/08/09 17:14:35 I don't really understand this. Would it be usefu
jiayl 2013/08/09 17:41:16 Added the link to the existing bug. I feel it's a
new PeerConnectionIdentityService(GURL(web_frame->document().url().spec())
.GetOrigin());
+#else
+ NULL;
+#endif // !defined(USE_OPENSSL)
return pc_factory_->CreatePeerConnection(ice_servers,
constraints,
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698