webrtc/api/java/jni/peerconnection_jni.cc - Issue 1920043002: Replace scoped_ptr with unique_ptr in webrtc/base/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/api/java/jni/peerconnection_jni.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

Index: webrtc/api/java/jni/peerconnection_jni.cc

diff --git a/webrtc/api/java/jni/peerconnection_jni.cc b/webrtc/api/java/jni/peerconnection_jni.cc

index fdd2d44bae196779f1c1ffbdfb29e19b7d7f8cf2..1a31885d89fe3670c31203391b65bea127342ca8 100644

--- a/webrtc/api/java/jni/peerconnection_jni.cc

+++ b/webrtc/api/java/jni/peerconnection_jni.cc

@@ -40,6 +40,7 @@

#define JNIEXPORT __attribute__((visibility("default")))

#include <limits>

+#include <memory>

#include <utility>

#include "webrtc/api/androidvideocapturer.h"

@@ -1565,7 +1566,7 @@ JOW(jlong, PeerConnectionFactory_nativeCreatePeerConnection)(

// Create ECDSA certificate.

if (JavaKeyTypeToNativeType(jni, j_key_type) == rtc::KT_ECDSA) {

- scoped_ptr<rtc::SSLIdentity> ssl_identity(

+ std::unique_ptr<rtc::SSLIdentity> ssl_identity(

rtc::SSLIdentity::Generate(webrtc::kIdentityName, rtc::KT_ECDSA));

if (ssl_identity.get()) {

rtc_config.certificates.push_back(

« no previous file with comments | « webrtc/api/dtlsidentitystore_unittest.cc ('k') | webrtc/api/objc/RTCConfiguration.mm » ('j') | no next file with comments »