Index: webrtc/voice_engine/test/channel_transport/udp_socket_manager_unittest.cc |
diff --git a/webrtc/voice_engine/test/channel_transport/udp_socket_manager_unittest.cc b/webrtc/voice_engine/test/channel_transport/udp_socket_manager_unittest.cc |
index 178474a11c2f1df804ec8b45bcb119b90a317ad7..0bd402cdf594bae4029c88890be4e58e22cac483 100644 |
--- a/webrtc/voice_engine/test/channel_transport/udp_socket_manager_unittest.cc |
+++ b/webrtc/voice_engine/test/channel_transport/udp_socket_manager_unittest.cc |
@@ -40,12 +40,11 @@ TEST(UdpSocketManager, AddAndRemoveSocketDoesNotLeakMemory) { |
uint8_t threads = 1; |
UdpSocketManager* mgr = UdpSocketManager::Create(id, threads); |
UdpSocketWrapper* socket = |
- UdpSocketWrapper::CreateSocket(id, |
- mgr, |
- NULL, // CallbackObj |
- NULL, // IncomingSocketCallback |
- false, // ipV6Enable |
- false); // disableGQOS |
+ UdpSocketWrapper::CreateSocket(id, mgr, |
+ nullptr, // CallbackObj |
+ nullptr, // IncomingSocketCallback |
+ false, // ipV6Enable |
+ false); // disableGQOS |
// The constructor will do AddSocket on the manager. |
// RemoveSocket indirectly calls Delete. |
EXPECT_EQ(true, mgr->RemoveSocket(socket)); |
@@ -64,18 +63,17 @@ TEST(UdpSocketManager, UnremovedSocketsGetCollectedAtManagerDeletion) { |
int32_t id = 42; |
uint8_t threads = 1; |
UdpSocketManager* mgr = UdpSocketManager::Create(id, threads); |
- UdpSocketWrapper* unused_socket = UdpSocketWrapper::CreateSocket( |
- id, |
- mgr, |
- NULL, // CallbackObj |
- NULL, // IncomingSocketCallback |
- false, // ipV6Enable |
- false); // disableGQOS |
+ UdpSocketWrapper* unused_socket = |
+ UdpSocketWrapper::CreateSocket(id, mgr, |
+ nullptr, // CallbackObj |
+ nullptr, // IncomingSocketCallback |
+ false, // ipV6Enable |
+ false); // disableGQOS |
// The constructor will do AddSocket on the manager. |
// Call a member funtion to work around "set but not used" compliation |
// error on ChromeOS ARM. |
unused_socket->SetEventToNull(); |
- unused_socket = NULL; |
+ unused_socket = nullptr; |
UdpSocketManager::Return(); |
#endif |
} |