Replacing DtlsIdentityStoreInterface with RTCCertificateGeneratorInterface.

webrtc/api/peerconnectioninterface.h

Index: webrtc/api/peerconnectioninterface.h
diff --git a/webrtc/api/peerconnectioninterface.h b/webrtc/api/peerconnectioninterface.h
index 4fa9bf2408d76826ea788354fa579508d04b3d8d..b02e672fb2647af15a018cb210c46c3c455abe43 100644
--- a/webrtc/api/peerconnectioninterface.h
+++ b/webrtc/api/peerconnectioninterface.h
@@ -68,6 +68,7 @@
 #include "webrtc/base/fileutils.h"
 #include "webrtc/base/network.h"
 #include "webrtc/base/rtccertificate.h"
+#include "webrtc/base/rtccertificategenerator.h"
 #include "webrtc/base/socketaddress.h"
 #include "webrtc/base/sslstreamadapter.h"
 #include "webrtc/media/base/mediachannel.h"
@@ -580,14 +581,48 @@ class PeerConnectionFactoryInterface : public rtc::RefCountInterface {
       const PeerConnectionInterface::RTCConfiguration& configuration,
       const MediaConstraintsInterface* constraints,
       std::unique_ptr<cricket::PortAllocator> allocator,
-      std::unique_ptr<DtlsIdentityStoreInterface> dtls_identity_store,
+      std::unique_ptr<rtc::RTCCertificateGeneratorInterface> cert_generator,
       PeerConnectionObserver* observer) = 0;
+  // TODO(hbos): To be removed in favor of the |cert_generator| version as soon
+  // as unittests stop using this version. See bugs.webrtc.org/5707,
+  // bugs.webrtc.org/5708.
+  rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnectionWithStore(
+      const PeerConnectionInterface::RTCConfiguration& configuration,
+      const MediaConstraintsInterface* constraints,
+      std::unique_ptr<cricket::PortAllocator> allocator,
+      std::unique_ptr<DtlsIdentityStoreInterface> dtls_identity_store,
+      PeerConnectionObserver* observer) {
+    return CreatePeerConnection(
+        configuration,
+        constraints,
+        std::move(allocator),
+        std::unique_ptr<rtc::RTCCertificateGeneratorInterface>(
+            dtls_identity_store ? new RTCCertificateGeneratorStoreWrapper(
+                std::move(dtls_identity_store)) : nullptr),
+        observer);
+  }
 
   virtual rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection(
       const PeerConnectionInterface::RTCConfiguration& configuration,
       std::unique_ptr<cricket::PortAllocator> allocator,
-      std::unique_ptr<DtlsIdentityStoreInterface> dtls_identity_store,
+      std::unique_ptr<rtc::RTCCertificateGeneratorInterface> cert_generator,
       PeerConnectionObserver* observer) = 0;
+  // TODO(hbos): To be removed in favor of the |cert_generator| version as soon
+  // as unittests stop using this version. See bugs.webrtc.org/5707,
+  // bugs.webrtc.org/5708.
+  rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnectionWithStore(
+      const PeerConnectionInterface::RTCConfiguration& configuration,
+      std::unique_ptr<cricket::PortAllocator> allocator,
+      std::unique_ptr<DtlsIdentityStoreInterface> dtls_identity_store,
+      PeerConnectionObserver* observer) {
+    return CreatePeerConnection(
+        configuration,
+        std::move(allocator),
+        std::unique_ptr<rtc::RTCCertificateGeneratorInterface>(
+            dtls_identity_store ? new RTCCertificateGeneratorStoreWrapper(
+                std::move(dtls_identity_store)) : nullptr),
+        observer);
+  }
 
   virtual rtc::scoped_refptr<MediaStreamInterface>
       CreateLocalMediaStream(const std::string& label) = 0;