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

Side by Side Diff: talk/app/webrtc/objc/RTCPeerConnectionInterface.mm

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, 7 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 unified diff | Download patch
« no previous file with comments | « no previous file | webrtc/api/dtlsidentitystore.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2015 Google Inc. 3 * Copyright 2015 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 nativeConfig.tcp_candidate_policy = 94 nativeConfig.tcp_candidate_policy =
95 [RTCEnumConverter nativeEnumForTcpCandidatePolicy:_tcpCandidatePolicy]; 95 [RTCEnumConverter nativeEnumForTcpCandidatePolicy:_tcpCandidatePolicy];
96 nativeConfig.audio_jitter_buffer_max_packets = _audioJitterBufferMaxPackets; 96 nativeConfig.audio_jitter_buffer_max_packets = _audioJitterBufferMaxPackets;
97 nativeConfig.ice_connection_receiving_timeout = _iceConnectionReceivingTimeout ; 97 nativeConfig.ice_connection_receiving_timeout = _iceConnectionReceivingTimeout ;
98 nativeConfig.ice_backup_candidate_pair_ping_interval = _iceBackupCandidatePair PingInterval; 98 nativeConfig.ice_backup_candidate_pair_ping_interval = _iceBackupCandidatePair PingInterval;
99 if (_keyType == kRTCEncryptionKeyTypeECDSA) { 99 if (_keyType == kRTCEncryptionKeyTypeECDSA) {
100 std::unique_ptr<rtc::SSLIdentity> identity( 100 std::unique_ptr<rtc::SSLIdentity> identity(
101 rtc::SSLIdentity::Generate(webrtc::kIdentityName, rtc::KT_ECDSA)); 101 rtc::SSLIdentity::Generate(webrtc::kIdentityName, rtc::KT_ECDSA));
102 if (identity) { 102 if (identity) {
103 nativeConfig.certificates.push_back( 103 nativeConfig.certificates.push_back(
104 rtc::RTCCertificate::Create( 104 rtc::RTCCertificate::Create(std::move(identity)));
105 rtc::UniqueToScoped(std::move(identity))));
106 } else { 105 } else {
107 RTCLogWarning(@"Failed to generate ECDSA identity. RSA will be used."); 106 RTCLogWarning(@"Failed to generate ECDSA identity. RSA will be used.");
108 } 107 }
109 } 108 }
110 return nativeConfig; 109 return nativeConfig;
111 } 110 }
112 111
113 @end 112 @end
OLDNEW
« no previous file with comments | « no previous file | webrtc/api/dtlsidentitystore.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698