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

Unified Diff: webrtc/api/quicdatachannel_unittest.cc

Issue 1937693002: Replace scoped_ptr with unique_ptr everywhere (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@unique5
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 | « talk/app/webrtc/objc/RTCVideoCapturer.mm ('k') | webrtc/api/quicdatatransport_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/api/quicdatachannel_unittest.cc
diff --git a/webrtc/api/quicdatachannel_unittest.cc b/webrtc/api/quicdatachannel_unittest.cc
index 1c5fc02aa9421fdb2634770f3ddab43a88ca9932..e701c29b4f31146a9436ac56096027e7b4eb0cba 100644
--- a/webrtc/api/quicdatachannel_unittest.cc
+++ b/webrtc/api/quicdatachannel_unittest.cc
@@ -11,13 +11,13 @@
#include "webrtc/api/quicdatachannel.h"
#include <map>
+#include <memory>
#include <sstream>
#include <string>
#include <vector>
#include "webrtc/base/bind.h"
#include "webrtc/base/gunit.h"
-#include "webrtc/base/scoped_ptr.h"
#include "webrtc/base/scoped_ref_ptr.h"
#include "webrtc/p2p/base/faketransportcontroller.h"
#include "webrtc/p2p/quic/quictransportchannel.h"
@@ -66,7 +66,7 @@ static const DataBuffer kOversizedBuffer(kOversizedMessage);
static rtc::SSLFingerprint* CreateFingerprint(rtc::RTCCertificate* cert) {
std::string digest_algorithm;
cert->ssl_certificate().GetSignatureDigestAlgorithm(&digest_algorithm);
- rtc::scoped_ptr<rtc::SSLFingerprint> fingerprint(
+ std::unique_ptr<rtc::SSLFingerprint> fingerprint(
rtc::SSLFingerprint::Create(digest_algorithm, cert->identity()));
return fingerprint.release();
}
@@ -176,7 +176,7 @@ class QuicDataChannelPeer {
void GenerateCertificateAndFingerprint() {
rtc::scoped_refptr<rtc::RTCCertificate> local_cert =
- rtc::RTCCertificate::Create(rtc::scoped_ptr<rtc::SSLIdentity>(
+ rtc::RTCCertificate::Create(std::unique_ptr<rtc::SSLIdentity>(
rtc::SSLIdentity::Generate("cert_name", rtc::KT_DEFAULT)));
quic_transport_channel_.SetLocalCertificate(local_cert);
local_fingerprint_.reset(CreateFingerprint(local_cert.get()));
@@ -206,7 +206,7 @@ class QuicDataChannelPeer {
ice_transport_channel_->SetDestination(other_peer->ice_transport_channel_);
}
- rtc::scoped_ptr<rtc::SSLFingerprint>& local_fingerprint() {
+ std::unique_ptr<rtc::SSLFingerprint>& local_fingerprint() {
return local_fingerprint_;
}
@@ -222,7 +222,7 @@ class QuicDataChannelPeer {
FakeTransportChannel* ice_transport_channel_;
QuicTransportChannel quic_transport_channel_;
- rtc::scoped_ptr<rtc::SSLFingerprint> local_fingerprint_;
+ std::unique_ptr<rtc::SSLFingerprint> local_fingerprint_;
FakeQuicDataTransport fake_quic_data_transport_;
};
@@ -248,9 +248,9 @@ class QuicDataChannelTest : public testing::Test {
peer1_.quic_transport_channel()->SetSslRole(rtc::SSL_CLIENT);
peer2_.quic_transport_channel()->SetSslRole(rtc::SSL_SERVER);
- rtc::scoped_ptr<rtc::SSLFingerprint>& peer1_fingerprint =
+ std::unique_ptr<rtc::SSLFingerprint>& peer1_fingerprint =
peer1_.local_fingerprint();
- rtc::scoped_ptr<rtc::SSLFingerprint>& peer2_fingerprint =
+ std::unique_ptr<rtc::SSLFingerprint>& peer2_fingerprint =
peer2_.local_fingerprint();
peer1_.quic_transport_channel()->SetRemoteFingerprint(
« no previous file with comments | « talk/app/webrtc/objc/RTCVideoCapturer.mm ('k') | webrtc/api/quicdatatransport_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698