Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(81)

Unified Diff: webrtc/p2p/quic/quictransportchannel.h

Issue 1923163003: Replace scoped_ptr with unique_ptr in webrtc/p2p/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/p2p/quic/quicsession_unittest.cc ('k') | webrtc/p2p/quic/quictransportchannel.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/p2p/quic/quictransportchannel.h
diff --git a/webrtc/p2p/quic/quictransportchannel.h b/webrtc/p2p/quic/quictransportchannel.h
index 49d786c7f640474f6569f8e4b20d48c97d540d05..c9c253d92dafd1dfbd1445fcf3b61eb8332b4d5e 100644
--- a/webrtc/p2p/quic/quictransportchannel.h
+++ b/webrtc/p2p/quic/quictransportchannel.h
@@ -11,6 +11,7 @@
#ifndef WEBRTC_P2P_QUIC_QUICTRANSPORTCHANNEL_H_
#define WEBRTC_P2P_QUIC_QUICTRANSPORTCHANNEL_H_
+#include <memory>
#include <string>
#include <vector>
@@ -117,7 +118,7 @@ class QuicTransportChannel : public TransportChannelImpl,
size_t result_len) override;
// TODO(mikescarlett): Remove this method once TransportChannel does not
// require defining it.
- rtc::scoped_ptr<rtc::SSLCertificate> GetRemoteSSLCertificate()
+ std::unique_ptr<rtc::SSLCertificate> GetRemoteSSLCertificate()
const override {
return nullptr;
}
@@ -277,7 +278,7 @@ class QuicTransportChannel : public TransportChannelImpl,
QuicTransportState quic_state_ = QUIC_TRANSPORT_NEW;
// QUIC session which establishes the crypto handshake and converts data
// to/from QUIC packets.
- rtc::scoped_ptr<QuicSession> quic_;
+ std::unique_ptr<QuicSession> quic_;
// Non-crypto config for |quic_|.
net::QuicConfig config_;
// Helper for net::QuicConnection that provides timing and
@@ -288,9 +289,9 @@ class QuicTransportChannel : public TransportChannelImpl,
// the handshake. This must be set before we start QUIC.
rtc::Optional<rtc::SSLRole> ssl_role_;
// Config for QUIC crypto client stream, used when |ssl_role_| is SSL_CLIENT.
- rtc::scoped_ptr<net::QuicCryptoClientConfig> quic_crypto_client_config_;
+ std::unique_ptr<net::QuicCryptoClientConfig> quic_crypto_client_config_;
// Config for QUIC crypto server stream, used when |ssl_role_| is SSL_SERVER.
- rtc::scoped_ptr<net::QuicCryptoServerConfig> quic_crypto_server_config_;
+ std::unique_ptr<net::QuicCryptoServerConfig> quic_crypto_server_config_;
// This peer's certificate.
rtc::scoped_refptr<rtc::RTCCertificate> local_certificate_;
// Fingerprint of the remote peer. This must be set before we start QUIC.
« no previous file with comments | « webrtc/p2p/quic/quicsession_unittest.cc ('k') | webrtc/p2p/quic/quictransportchannel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698