diff --git a/webrtc/api/BUILD.gn b/webrtc/api/BUILD.gn index 8f3327a13d..391af74e7e 100644 --- a/webrtc/api/BUILD.gn +++ b/webrtc/api/BUILD.gn @@ -36,7 +36,6 @@ source_set("libjingle_peerconnection") { "datachannel.cc", "datachannel.h", "datachannelinterface.h", - "dtlsidentitystore.h", "dtmfsender.cc", "dtmfsender.h", "dtmfsenderinterface.h", diff --git a/webrtc/api/android/jni/peerconnection_jni.cc b/webrtc/api/android/jni/peerconnection_jni.cc index b5a191dddb..fefb44785a 100644 --- a/webrtc/api/android/jni/peerconnection_jni.cc +++ b/webrtc/api/android/jni/peerconnection_jni.cc @@ -44,7 +44,6 @@ #include #include "webrtc/api/androidvideocapturer.h" -#include "webrtc/api/dtlsidentitystore.h" #include "webrtc/api/android/jni/androidmediadecoder_jni.h" #include "webrtc/api/android/jni/androidmediaencoder_jni.h" #include "webrtc/api/android/jni/androidnetworkmonitor_jni.h" diff --git a/webrtc/api/api.gyp b/webrtc/api/api.gyp index eb8c9c07ea..15c88dd0f3 100644 --- a/webrtc/api/api.gyp +++ b/webrtc/api/api.gyp @@ -108,7 +108,6 @@ 'datachannel.cc', 'datachannel.h', 'datachannelinterface.h', - 'dtlsidentitystore.h', 'dtmfsender.cc', 'dtmfsender.h', 'dtmfsenderinterface.h', diff --git a/webrtc/api/dtlsidentitystore.h b/webrtc/api/dtlsidentitystore.h deleted file mode 100644 index 2558e45db4..0000000000 --- a/webrtc/api/dtlsidentitystore.h +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright 2015 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#ifndef WEBRTC_API_DTLSIDENTITYSTORE_H_ -#define WEBRTC_API_DTLSIDENTITYSTORE_H_ - -#include -#include -#include -#include - -#include "webrtc/base/messagehandler.h" -#include "webrtc/base/messagequeue.h" -#include "webrtc/base/optional.h" -#include "webrtc/base/refcount.h" -#include "webrtc/base/rtccertificategenerator.h" -#include "webrtc/base/scoped_ref_ptr.h" -#include "webrtc/base/sslidentity.h" -#include "webrtc/base/thread.h" - -namespace webrtc { - -class SSLIdentity; -class Thread; - -// Used to receive callbacks of DTLS identity requests. -class DtlsIdentityRequestObserver : public rtc::RefCountInterface { - public: - virtual void OnFailure(int error) = 0; - // TODO(hbos): Unify the OnSuccess method once Chrome code is updated. - virtual void OnSuccess(const std::string& der_cert, - const std::string& der_private_key) = 0; - // |identity| is a unique_ptr because rtc::SSLIdentity is not copyable and the - // client has to get the ownership of the object to make use of it. - virtual void OnSuccess(std::unique_ptr identity) = 0; - - protected: - virtual ~DtlsIdentityRequestObserver() {} -}; - -// This interface defines an in-memory DTLS identity store, which generates DTLS -// identities. -// APIs calls must be made on the signaling thread and the callbacks are also -// called on the signaling thread. -class DtlsIdentityStoreInterface { - public: - virtual ~DtlsIdentityStoreInterface() { } - - // The |observer| will be called when the requested identity is ready, or when - // identity generation fails. - virtual void RequestIdentity( - const rtc::KeyParams& key_params, - const rtc::Optional& expires_ms, - const rtc::scoped_refptr& observer) = 0; -}; - -} // namespace webrtc - -#endif // WEBRTC_API_DTLSIDENTITYSTORE_H_ diff --git a/webrtc/api/peerconnectionfactory_unittest.cc b/webrtc/api/peerconnectionfactory_unittest.cc index 209587de85..2d158e16af 100644 --- a/webrtc/api/peerconnectionfactory_unittest.cc +++ b/webrtc/api/peerconnectionfactory_unittest.cc @@ -27,7 +27,6 @@ #include "webrtc/p2p/base/fakeportallocator.h" using webrtc::DataChannelInterface; -using webrtc::DtlsIdentityStoreInterface; using webrtc::FakeVideoTrackRenderer; using webrtc::MediaStreamInterface; using webrtc::PeerConnectionFactoryInterface; diff --git a/webrtc/api/test/fakertccertificategenerator.h b/webrtc/api/test/fakertccertificategenerator.h index 77ff9dc987..34fc1c53a9 100644 --- a/webrtc/api/test/fakertccertificategenerator.h +++ b/webrtc/api/test/fakertccertificategenerator.h @@ -15,9 +15,9 @@ #include #include -#include "webrtc/api/dtlsidentitystore.h" #include "webrtc/api/peerconnectioninterface.h" #include "webrtc/base/rtccertificate.h" +#include "webrtc/base/rtccertificategenerator.h" // RSA with mod size 1024, pub exp 0x10001. static const rtc::RTCCertificatePEM kRsaPems[] = { diff --git a/webrtc/api/webrtcsession_unittest.cc b/webrtc/api/webrtcsession_unittest.cc index 29f94dedb4..b90daee510 100644 --- a/webrtc/api/webrtcsession_unittest.cc +++ b/webrtc/api/webrtcsession_unittest.cc @@ -61,7 +61,6 @@ using webrtc::CreateSessionDescription; using webrtc::CreateSessionDescriptionObserver; using webrtc::CreateSessionDescriptionRequest; using webrtc::DataChannel; -using webrtc::DtlsIdentityStoreInterface; using webrtc::FakeMetricsObserver; using webrtc::IceCandidateCollection; using webrtc::InternalDataChannelInit; diff --git a/webrtc/api/webrtcsessiondescriptionfactory.h b/webrtc/api/webrtcsessiondescriptionfactory.h index c0c45b6ee5..314679d24f 100644 --- a/webrtc/api/webrtcsessiondescriptionfactory.h +++ b/webrtc/api/webrtcsessiondescriptionfactory.h @@ -13,7 +13,6 @@ #include -#include "webrtc/api/dtlsidentitystore.h" #include "webrtc/api/peerconnectioninterface.h" #include "webrtc/base/constructormagic.h" #include "webrtc/base/messagehandler.h"