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

Unified Diff: talk/app/webrtc/objc/RTCPeerConnection.mm

Issue 1151943005: Ability to specify KeyType (RSA, ECDSA) for SSLIdentity generation in libjingle (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Addressing ASAN, LSAN issues in unittests Created 5 years, 6 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: talk/app/webrtc/objc/RTCPeerConnection.mm
diff --git a/talk/app/webrtc/objc/RTCPeerConnection.mm b/talk/app/webrtc/objc/RTCPeerConnection.mm
index 0d30acc0eb23ba6b00c8ea16eacfba8cf7d78fbc..2456fc87dbad21baf22389825bb439fcf9c7f657 100644
--- a/talk/app/webrtc/objc/RTCPeerConnection.mm
+++ b/talk/app/webrtc/objc/RTCPeerConnection.mm
@@ -275,11 +275,11 @@ class RTCStatsObserver : public StatsObserver {
- (instancetype)initWithFactory:(webrtc::PeerConnectionFactoryInterface*)factory
iceServers:(const webrtc::PeerConnectionInterface::IceServers&)iceServers
constraints:(const webrtc::MediaConstraintsInterface*)constraints {
- NSParameterAssert(factory != NULL);
+ NSParameterAssert(factory != nullptr);
if (self = [super init]) {
_observer.reset(new webrtc::RTCPeerConnectionObserver(self));
_peerConnection = factory->CreatePeerConnection(
- iceServers, constraints, NULL, NULL, _observer.get());
+ iceServers, constraints, nullptr, _observer.get(), nullptr);
_localStreams = [[NSMutableArray alloc] init];
}
return self;
@@ -292,8 +292,8 @@ class RTCStatsObserver : public StatsObserver {
NSParameterAssert(factory);
if (self = [super init]) {
_observer.reset(new webrtc::RTCPeerConnectionObserver(self));
- _peerConnection =
- factory->CreatePeerConnection(config, constraints, nullptr, nullptr, _observer.get());
+ _peerConnection = factory->CreatePeerConnection(
+ config, constraints, nullptr, _observer.get(), nullptr);
_localStreams = [[NSMutableArray alloc] init];
_delegate = delegate;
}

Powered by Google App Engine
This is Rietveld 408576698