| Index: webrtc/p2p/base/dtlstransportchannel.h
|
| diff --git a/webrtc/p2p/base/dtlstransportchannel.h b/webrtc/p2p/base/dtlstransportchannel.h
|
| index b6c3cfd2510fba04b20e62c340d0c0fe79d4c59c..08dd04c198af7da29646e175eb7889e0a309caf5 100644
|
| --- a/webrtc/p2p/base/dtlstransportchannel.h
|
| +++ b/webrtc/p2p/base/dtlstransportchannel.h
|
| @@ -11,13 +11,13 @@
|
| #ifndef WEBRTC_P2P_BASE_DTLSTRANSPORTCHANNEL_H_
|
| #define WEBRTC_P2P_BASE_DTLSTRANSPORTCHANNEL_H_
|
|
|
| +#include <memory>
|
| #include <string>
|
| #include <vector>
|
|
|
| #include "webrtc/p2p/base/transportchannelimpl.h"
|
| #include "webrtc/base/buffer.h"
|
| #include "webrtc/base/bufferqueue.h"
|
| -#include "webrtc/base/scoped_ptr.h"
|
| #include "webrtc/base/sslstreamadapter.h"
|
| #include "webrtc/base/stream.h"
|
|
|
| @@ -137,7 +137,7 @@ class DtlsTransportChannelWrapper : public TransportChannelImpl {
|
|
|
| // Once DTLS has been established, this method retrieves the certificate in
|
| // use by the remote peer, for use in external identity verification.
|
| - rtc::scoped_ptr<rtc::SSLCertificate> GetRemoteSSLCertificate() const override;
|
| + std::unique_ptr<rtc::SSLCertificate> GetRemoteSSLCertificate() const override;
|
|
|
| // Once DTLS has established (i.e., this channel is writable), this method
|
| // extracts the keys negotiated during the DTLS handshake, for use in external
|
| @@ -226,7 +226,7 @@ class DtlsTransportChannelWrapper : public TransportChannelImpl {
|
| rtc::Thread* worker_thread_; // Everything should occur on this thread.
|
| // Underlying channel, not owned by this class.
|
| TransportChannelImpl* const channel_;
|
| - rtc::scoped_ptr<rtc::SSLStreamAdapter> dtls_; // The DTLS stream
|
| + std::unique_ptr<rtc::SSLStreamAdapter> dtls_; // The DTLS stream
|
| StreamInterfaceChannel* downward_; // Wrapper for channel_, owned by dtls_.
|
| std::vector<int> srtp_ciphers_; // SRTP ciphers to use with DTLS.
|
| bool dtls_active_ = false;
|
|
|