Passing NULL PeerConnectionIdentityService to Libjingle when Chrome is using openssl.

content/renderer/media/media_stream_dependency_factory.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/media_stream_dependency_factory.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 532 matching lines @@
             url));
   }
 
   scoped_refptr<P2PPortAllocatorFactory> pa_factory =
         new talk_base::RefCountedObject<P2PPortAllocatorFactory>(
             p2p_socket_dispatcher_.get(),
             network_manager_,
             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 useful to file a crbug (and point
to it from here) that enumerates the missing bits from openssl?

(should PCIS expose the fact that it is useless because of lack of underlying
impl details?  It seems strange to have to guard for this condition from here)

[jiayl, 2013/08/09 17:41:16]

Added the link to the existing bug.
I feel it's a cleaner interaction with Libjingle if NULL means "generate by
yourself" and non-NULL means "I can do it for you", instead of making Libjingle
checking error codes, which come from a header in Chrome.

       new PeerConnectionIdentityService(GURL(web_frame->document().url().spec())
                                             .GetOrigin());
+#else
+      NULL;
+#endif  // !defined(USE_OPENSSL)
 
   return pc_factory_->CreatePeerConnection(ice_servers,
                                            constraints,
                                            pa_factory.get(),
                                            identity_service,
                                            observer).get();
 }
 
 scoped_refptr<webrtc::MediaStreamInterface>
 MediaStreamDependencyFactory::CreateLocalMediaStream(
@@ skipping 250 matching lines @@
   }
 
   // Add the capturer to the WebRtcAudioDeviceImpl if it is a new capturer.
   if (is_new_capturer)
     GetWebRtcAudioDevice()->AddAudioCapturer(capturer);
 
   return capturer;
 }
 
 }  // namespace content