Index: webrtc/p2p/base/stunrequest_unittest.cc |
diff --git a/webrtc/p2p/base/stunrequest_unittest.cc b/webrtc/p2p/base/stunrequest_unittest.cc |
index 9b8ccac1ed1cf64416eb08d47b3fcbac72ea5d0d..f15ec210959cd0e5038913f2cfe3e54339b16d3e 100644 |
--- a/webrtc/p2p/base/stunrequest_unittest.cc |
+++ b/webrtc/p2p/base/stunrequest_unittest.cc |
@@ -23,8 +23,11 @@ class StunRequestTest : public testing::Test, |
public: |
StunRequestTest() |
: manager_(rtc::Thread::Current()), |
- request_count_(0), response_(NULL), |
- success_(false), failure_(false), timeout_(false) { |
+ request_count_(0), |
+ response_(nullptr), |
+ success_(false), |
+ failure_(false), |
+ timeout_(false) { |
manager_.SignalSendPacket.connect(this, &StunRequestTest::OnSendPacket); |
} |
@@ -94,7 +97,7 @@ class StunRequestThunker : public StunRequest { |
// Test handling of a normal binding response. |
TEST_F(StunRequestTest, TestSuccess) { |
- StunMessage* req = CreateStunMessage(STUN_BINDING_REQUEST, NULL); |
+ StunMessage* req = CreateStunMessage(STUN_BINDING_REQUEST, nullptr); |
manager_.Send(new StunRequestThunker(req, this)); |
StunMessage* res = CreateStunMessage(STUN_BINDING_RESPONSE, req); |
@@ -109,7 +112,7 @@ TEST_F(StunRequestTest, TestSuccess) { |
// Test handling of an error binding response. |
TEST_F(StunRequestTest, TestError) { |
- StunMessage* req = CreateStunMessage(STUN_BINDING_REQUEST, NULL); |
+ StunMessage* req = CreateStunMessage(STUN_BINDING_REQUEST, nullptr); |
manager_.Send(new StunRequestThunker(req, this)); |
StunMessage* res = CreateStunMessage(STUN_BINDING_ERROR_RESPONSE, req); |
@@ -124,13 +127,13 @@ TEST_F(StunRequestTest, TestError) { |
// Test handling of a binding response with the wrong transaction id. |
TEST_F(StunRequestTest, TestUnexpected) { |
- StunMessage* req = CreateStunMessage(STUN_BINDING_REQUEST, NULL); |
+ StunMessage* req = CreateStunMessage(STUN_BINDING_REQUEST, nullptr); |
manager_.Send(new StunRequestThunker(req, this)); |
- StunMessage* res = CreateStunMessage(STUN_BINDING_RESPONSE, NULL); |
+ StunMessage* res = CreateStunMessage(STUN_BINDING_RESPONSE, nullptr); |
EXPECT_FALSE(manager_.CheckResponse(res)); |
- EXPECT_TRUE(response_ == NULL); |
+ EXPECT_TRUE(response_ == nullptr); |
EXPECT_FALSE(success_); |
EXPECT_FALSE(failure_); |
EXPECT_FALSE(timeout_); |
@@ -140,7 +143,7 @@ TEST_F(StunRequestTest, TestUnexpected) { |
// Test that requests are sent at the right times. |
TEST_F(StunRequestTest, TestBackoff) { |
rtc::ScopedFakeClock fake_clock; |
- StunMessage* req = CreateStunMessage(STUN_BINDING_REQUEST, NULL); |
+ StunMessage* req = CreateStunMessage(STUN_BINDING_REQUEST, nullptr); |
int64_t start = rtc::TimeMillis(); |
manager_.Send(new StunRequestThunker(req, this)); |
@@ -165,14 +168,14 @@ TEST_F(StunRequestTest, TestBackoff) { |
// Test that we timeout properly if no response is received. |
TEST_F(StunRequestTest, TestTimeout) { |
rtc::ScopedFakeClock fake_clock; |
- StunMessage* req = CreateStunMessage(STUN_BINDING_REQUEST, NULL); |
+ StunMessage* req = CreateStunMessage(STUN_BINDING_REQUEST, nullptr); |
StunMessage* res = CreateStunMessage(STUN_BINDING_RESPONSE, req); |
manager_.Send(new StunRequestThunker(req, this)); |
SIMULATED_WAIT(false, cricket::STUN_TOTAL_TIMEOUT, fake_clock); |
EXPECT_FALSE(manager_.CheckResponse(res)); |
- EXPECT_TRUE(response_ == NULL); |
+ EXPECT_TRUE(response_ == nullptr); |
EXPECT_FALSE(success_); |
EXPECT_FALSE(failure_); |
EXPECT_TRUE(timeout_); |