| Index: webrtc/base/ssladapter_unittest.cc
|
| diff --git a/webrtc/base/ssladapter_unittest.cc b/webrtc/base/ssladapter_unittest.cc
|
| index c591f19658f30d19acfa9a338ccf7ddd2ce59a65..c8afbe6a75371b4f69d02cdce311b60bcbcd559f 100644
|
| --- a/webrtc/base/ssladapter_unittest.cc
|
| +++ b/webrtc/base/ssladapter_unittest.cc
|
| @@ -165,8 +165,8 @@ class SSLAdapterTestDummyServer : public sigslot::has_slots<> {
|
| }
|
|
|
| int Send(const std::string& message) {
|
| - if (ssl_stream_adapter_ == NULL
|
| - || ssl_stream_adapter_->GetState() != rtc::SS_OPEN) {
|
| + if (ssl_stream_adapter_ == nullptr ||
|
| + ssl_stream_adapter_->GetState() != rtc::SS_OPEN) {
|
| // No connection yet.
|
| return -1;
|
| }
|
| @@ -187,7 +187,7 @@ class SSLAdapterTestDummyServer : public sigslot::has_slots<> {
|
|
|
| void AcceptConnection(const rtc::SocketAddress& address) {
|
| // Only a single connection is supported.
|
| - ASSERT_TRUE(ssl_stream_adapter_ == NULL);
|
| + ASSERT_TRUE(ssl_stream_adapter_ == nullptr);
|
|
|
| // This is only for DTLS.
|
| ASSERT_EQ(rtc::SSL_MODE_DTLS, ssl_mode_);
|
| @@ -202,9 +202,9 @@ class SSLAdapterTestDummyServer : public sigslot::has_slots<> {
|
|
|
| void OnServerSocketReadEvent(rtc::AsyncSocket* socket) {
|
| // Only a single connection is supported.
|
| - ASSERT_TRUE(ssl_stream_adapter_ == NULL);
|
| + ASSERT_TRUE(ssl_stream_adapter_ == nullptr);
|
|
|
| - DoHandshake(server_socket_->Accept(NULL));
|
| + DoHandshake(server_socket_->Accept(nullptr));
|
| }
|
|
|
| void OnSSLStreamAdapterEvent(rtc::StreamInterface* stream, int sig, int err) {
|
| @@ -274,7 +274,7 @@ class SSLAdapterTestBase : public testing::Test,
|
| explicit SSLAdapterTestBase(const rtc::SSLMode& ssl_mode,
|
| const rtc::KeyParams& key_params)
|
| : ssl_mode_(ssl_mode),
|
| - ss_scope_(new rtc::VirtualSocketServer(NULL)),
|
| + ss_scope_(new rtc::VirtualSocketServer(nullptr)),
|
| server_(new SSLAdapterTestDummyServer(ssl_mode_, key_params)),
|
| client_(new SSLAdapterTestDummyClient(ssl_mode_)),
|
| handshake_wait_(kTimeout) {}
|
|
|