Index: webrtc/base/testutils.h |
diff --git a/webrtc/base/testutils.h b/webrtc/base/testutils.h |
index ac7fd93626caa75839439a5769a40818cef52530..305d3d0a6b7df6555f022cc5775541a128f3f937 100644 |
--- a/webrtc/base/testutils.h |
+++ b/webrtc/base/testutils.h |
@@ -276,14 +276,12 @@ private: |
class SocketTestClient : public sigslot::has_slots<> { |
public: |
- SocketTestClient() { |
- Init(NULL, AF_INET); |
- } |
- SocketTestClient(AsyncSocket* socket) { |
- Init(socket, socket->GetLocalAddress().family()); |
+ SocketTestClient() { Init(nullptr, AF_INET); } |
+ SocketTestClient(AsyncSocket* socket) { |
+ Init(socket, socket->GetLocalAddress().family()); |
} |
SocketTestClient(const SocketAddress& address) { |
- Init(NULL, address.family()); |
+ Init(nullptr, address.family()); |
socket_->Connect(address); |
} |
@@ -408,8 +406,7 @@ class SocketTestServer : public sigslot::has_slots<> { |
private: |
void OnReadEvent(AsyncSocket* socket) { |
- AsyncSocket* accepted = |
- static_cast<AsyncSocket*>(socket_->Accept(NULL)); |
+ AsyncSocket* accepted = static_cast<AsyncSocket*>(socket_->Accept(nullptr)); |
if (!accepted) |
return; |
clients_.push_back(new SocketTestClient(accepted)); |
@@ -530,9 +527,9 @@ inline AssertionResult CmpHelperMemEq(const char* expected_expression, |
#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) |
struct XDisplay { |
- XDisplay() : display_(XOpenDisplay(NULL)) { } |
+ XDisplay() : display_(XOpenDisplay(nullptr)) {} |
~XDisplay() { if (display_) XCloseDisplay(display_); } |
- bool IsValid() const { return display_ != NULL; } |
+ bool IsValid() const { return display_ != nullptr; } |
operator Display*() { return display_; } |
private: |
Display* display_; |