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

Unified Diff: webrtc/api/statscollector.cc

Issue 1920043002: Replace scoped_ptr with unique_ptr in webrtc/base/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased 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/api/objc/RTCConfiguration.mm ('k') | webrtc/api/statscollector_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/api/statscollector.cc
diff --git a/webrtc/api/statscollector.cc b/webrtc/api/statscollector.cc
index 38fb5fb7db19f17c4fe2b935624478d9f1f28c55..82c97cc7cd5929af4a545a7f3c9a20f48a173f18 100644
--- a/webrtc/api/statscollector.cc
+++ b/webrtc/api/statscollector.cc
@@ -10,18 +10,16 @@
#include "webrtc/api/statscollector.h"
+#include <memory>
#include <utility>
#include <vector>
#include "webrtc/api/peerconnection.h"
#include "webrtc/base/base64.h"
#include "webrtc/base/checks.h"
-#include "webrtc/base/scoped_ptr.h"
#include "webrtc/base/timing.h"
#include "webrtc/pc/channel.h"
-using rtc::scoped_ptr;
-
namespace webrtc {
namespace {
@@ -532,7 +530,7 @@ StatsReport* StatsCollector::AddOneCertificateReport(
if (!cert->GetSignatureDigestAlgorithm(&digest_algorithm))
return nullptr;
- rtc::scoped_ptr<rtc::SSLFingerprint> ssl_fingerprint(
+ std::unique_ptr<rtc::SSLFingerprint> ssl_fingerprint(
rtc::SSLFingerprint::Create(digest_algorithm, cert));
// SSLFingerprint::Create can fail if the algorithm returned by
@@ -574,7 +572,7 @@ StatsReport* StatsCollector::AddCertificateReports(
RTC_DCHECK(cert != NULL);
StatsReport* issuer = nullptr;
- rtc::scoped_ptr<rtc::SSLCertChain> chain = cert->GetChain();
+ std::unique_ptr<rtc::SSLCertChain> chain = cert->GetChain();
if (chain) {
// This loop runs in reverse, i.e. from root to leaf, so that each
// certificate's issuer's report ID is known before the child certificate's
@@ -702,7 +700,7 @@ void StatsCollector::ExtractSessionInfo() {
local_cert_report_id = r->id();
}
- rtc::scoped_ptr<rtc::SSLCertificate> cert =
+ std::unique_ptr<rtc::SSLCertificate> cert =
pc_->session()->GetRemoteSSLCertificate(
transport_iter.second.transport_name);
if (cert) {
« no previous file with comments | « webrtc/api/objc/RTCConfiguration.mm ('k') | webrtc/api/statscollector_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698