Added DtlsCertificate, a ref counted object owning an SSLIdentity

talk/app/webrtc/peerconnectioninterface.h

 /*
  * libjingle
  * Copyright 2012 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 54 matching lines @@
 // 7. Once a candidate have been found PeerConnection will call the observer
 // function OnIceCandidate. Send these candidates to the remote peer.
 
 #ifndef TALK_APP_WEBRTC_PEERCONNECTIONINTERFACE_H_
 #define TALK_APP_WEBRTC_PEERCONNECTIONINTERFACE_H_
 
 #include <string>
 #include <vector>
 
 #include "talk/app/webrtc/datachannelinterface.h"
+#include "talk/app/webrtc/dtlscertificate.h"
 #include "talk/app/webrtc/dtlsidentitystore.h"
 #include "talk/app/webrtc/dtmfsenderinterface.h"
 #include "talk/app/webrtc/jsep.h"
 #include "talk/app/webrtc/mediastreaminterface.h"
 #include "talk/app/webrtc/statstypes.h"
 #include "talk/app/webrtc/umametrics.h"
 #include "webrtc/base/fileutils.h"
 #include "webrtc/base/network.h"
 #include "webrtc/base/sslstreamadapter.h"
 #include "webrtc/base/socketaddress.h"
@@ skipping 451 matching lines @@
   // TODO(hbos): Temporary CreatePeerConnection function while we transition
   // from DTLSIdentityServiceInterface to DtlsIdentityStoreInterface.
   rtc::scoped_refptr<PeerConnectionInterface>
       CreatePeerConnection(
           const PeerConnectionInterface::RTCConfiguration& configuration,
           const MediaConstraintsInterface* constraints,
           PortAllocatorFactoryInterface* allocator_factory,
           DTLSIdentityServiceInterface* dtls_identity_service,
           rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store,
           PeerConnectionObserver* observer) {
+    rtc::scoped_refptr<DtlsCertificate> null_cert = nullptr;
     return CreatePeerConnection(configuration, constraints, allocator_factory,
-                                dtls_identity_service, observer);
+                                dtls_identity_service, null_cert, observer);
   }
 
   // This method takes the ownership of |dtls_identity_service|.
+  // TODO(hbos): Remove this version of CreatePeerConnection in favor of the
+  // one taking certificate when Chromium uses it.
+  rtc::scoped_refptr<PeerConnectionInterface>
+        CreatePeerConnection(
+            const PeerConnectionInterface::RTCConfiguration& configuration,
+            const MediaConstraintsInterface* constraints,
+            PortAllocatorFactoryInterface* allocator_factory,
+            DTLSIdentityServiceInterface* dtls_identity_service,
+            PeerConnectionObserver* observer) {
+    rtc::scoped_refptr<DtlsCertificate> null_cert = nullptr;
+    return CreatePeerConnection(configuration, constraints, allocator_factory,
+                                dtls_identity_service, null_cert, observer);
+  }
+
+  // This method takes the ownership of |dtls_identity_service|.
   virtual rtc::scoped_refptr<PeerConnectionInterface>
       CreatePeerConnection(
           const PeerConnectionInterface::RTCConfiguration& configuration,
           const MediaConstraintsInterface* constraints,
           PortAllocatorFactoryInterface* allocator_factory,
           DTLSIdentityServiceInterface* dtls_identity_service,
+          rtc::scoped_refptr<DtlsCertificate> certificate,
           PeerConnectionObserver* observer) = 0;

[hbos, 2015/08/06 12:11:34]

I should add a comment saying what |dtls_identity_service| and |certificate| is
used for here and in WebRtcSessionDescriptionFactory.

Like before, the service is used to generate an identity (a certificate). If a
null service is provided a default one is used (the webrtc implementation).
Both the service and the certificate are optional parameters (can be null),
however if a certificate is provided then there is no need to use the service.
In that case the service is as good as ignored, except for the fact that this
function takes ownership of it.

 
   // TODO(mallinath) : Remove below versions after clients are updated
   // to above method.
   // In latest W3C WebRTC draft, PC constructor will take RTCConfiguration,
   // and not IceServers. RTCConfiguration is made up of ice servers and
   // ice transport type.
   // http://dev.w3.org/2011/webrtc/editor/webrtc.html
   inline rtc::scoped_refptr<PeerConnectionInterface>
       CreatePeerConnection(
           const PeerConnectionInterface::IceServers& servers,
           const MediaConstraintsInterface* constraints,
           PortAllocatorFactoryInterface* allocator_factory,
           DTLSIdentityServiceInterface* dtls_identity_service,
           PeerConnectionObserver* observer) {
       PeerConnectionInterface::RTCConfiguration rtc_config;
       rtc_config.servers = servers;
+      rtc::scoped_refptr<DtlsCertificate> null_cert = nullptr;
       return CreatePeerConnection(rtc_config, constraints, allocator_factory,
-                                  dtls_identity_service, observer);
+                                  dtls_identity_service, null_cert, observer);
   }
 
   virtual rtc::scoped_refptr<MediaStreamInterface>
       CreateLocalMediaStream(const std::string& label) = 0;
 
   // Creates a AudioSourceInterface.
   // |constraints| decides audio processing settings but can be NULL.
   virtual rtc::scoped_refptr<AudioSourceInterface> CreateAudioSource(
       const MediaConstraintsInterface* constraints) = 0;
 
@@ skipping 40 matching lines @@
 CreatePeerConnectionFactory(
     rtc::Thread* worker_thread,
     rtc::Thread* signaling_thread,
     AudioDeviceModule* default_adm,
     cricket::WebRtcVideoEncoderFactory* encoder_factory,
     cricket::WebRtcVideoDecoderFactory* decoder_factory);
 
 }  // namespace webrtc
 
 #endif  // TALK_APP_WEBRTC_PEERCONNECTIONINTERFACE_H_