| Index: webrtc/base/rtccertificategenerator.h
|
| diff --git a/webrtc/base/rtccertificategenerator.h b/webrtc/base/rtccertificategenerator.h
|
| index c131d695fdb60cb459c38ca0cb6053df362be8c2..fac1cec9efc140d51fc0af39fd430dade94babeb 100644
|
| --- a/webrtc/base/rtccertificategenerator.h
|
| +++ b/webrtc/base/rtccertificategenerator.h
|
| @@ -11,76 +11,9 @@
|
| #ifndef WEBRTC_BASE_RTCCERTIFICATEGENERATOR_H_
|
| #define WEBRTC_BASE_RTCCERTIFICATEGENERATOR_H_
|
|
|
| -#include "webrtc/base/optional.h"
|
| -#include "webrtc/base/refcount.h"
|
| -#include "webrtc/base/rtccertificate.h"
|
| -#include "webrtc/base/scoped_ref_ptr.h"
|
| -#include "webrtc/base/sslidentity.h"
|
| -#include "webrtc/base/thread.h"
|
|
|
| -namespace rtc {
|
| -
|
| -// See |RTCCertificateGeneratorInterface::GenerateCertificateAsync|.
|
| -class RTCCertificateGeneratorCallback : public RefCountInterface {
|
| - public:
|
| - virtual void OnSuccess(
|
| - const scoped_refptr<RTCCertificate>& certificate) = 0;
|
| - virtual void OnFailure() = 0;
|
| -
|
| - protected:
|
| - ~RTCCertificateGeneratorCallback() override {}
|
| -};
|
| -
|
| -// Generates |RTCCertificate|s.
|
| -// See |RTCCertificateGenerator| for the WebRTC repo's implementation.
|
| -class RTCCertificateGeneratorInterface {
|
| - public:
|
| - virtual ~RTCCertificateGeneratorInterface() {}
|
| -
|
| - // Generates a certificate asynchronously on the worker thread.
|
| - // Must be called on the signaling thread. The |callback| is invoked with the
|
| - // result on the signaling thread. |exipres_ms| optionally specifies for how
|
| - // long we want the certificate to be valid, but the implementation may choose
|
| - // its own restrictions on the expiration time.
|
| - virtual void GenerateCertificateAsync(
|
| - const KeyParams& key_params,
|
| - const Optional<uint64_t>& expires_ms,
|
| - const scoped_refptr<RTCCertificateGeneratorCallback>& callback) = 0;
|
| -};
|
| -
|
| -// Standard implementation of |RTCCertificateGeneratorInterface|.
|
| -// The static function |GenerateCertificate| generates a certificate on the
|
| -// current thread. The |RTCCertificateGenerator| instance generates certificates
|
| -// asynchronously on the worker thread with |GenerateCertificateAsync|.
|
| -class RTCCertificateGenerator : public RTCCertificateGeneratorInterface {
|
| - public:
|
| - // Generates a certificate on the current thread. Returns null on failure.
|
| - // If |expires_ms| is specified, the certificate will expire in approximately
|
| - // that many milliseconds from now. |expires_ms| is limited to a year, a
|
| - // larger value than that is clamped down to a year. If |expires_ms| is not
|
| - // specified, a default expiration time is used.
|
| - static scoped_refptr<RTCCertificate> GenerateCertificate(
|
| - const KeyParams& key_params,
|
| - const Optional<uint64_t>& expires_ms);
|
| -
|
| - RTCCertificateGenerator(Thread* signaling_thread, Thread* worker_thread);
|
| - ~RTCCertificateGenerator() override {}
|
| -
|
| - // |RTCCertificateGeneratorInterface| overrides.
|
| - // If |expires_ms| is specified, the certificate will expire in approximately
|
| - // that many milliseconds from now. |expires_ms| is limited to a year, a
|
| - // larger value than that is clamped down to a year. If |expires_ms| is not
|
| - // specified, a default expiration time is used.
|
| - void GenerateCertificateAsync(
|
| - const KeyParams& key_params,
|
| - const Optional<uint64_t>& expires_ms,
|
| - const scoped_refptr<RTCCertificateGeneratorCallback>& callback) override;
|
| -
|
| - private:
|
| - Thread* const signaling_thread_;
|
| - Thread* const worker_thread_;
|
| -};
|
| -
|
| -} // namespace rtc
|
| +// This header is deprecated and is just left here temporarily during
|
| +// refactoring. See https://bugs.webrtc.org/7634 for more details.
|
| +#include "webrtc/rtc_base/rtccertificategenerator.h"
|
|
|
| #endif // WEBRTC_BASE_RTCCERTIFICATEGENERATOR_H_
|
|
|