Index: webrtc/p2p/base/stunrequest.cc |
diff --git a/webrtc/p2p/base/stunrequest.cc b/webrtc/p2p/base/stunrequest.cc |
index ef2bee8aa819c251f7920df001666867912dc9dc..f0ad0ca7d633f40e7b411bb0844237d74aef7169 100644 |
--- a/webrtc/p2p/base/stunrequest.cc |
+++ b/webrtc/p2p/base/stunrequest.cc |
@@ -62,9 +62,9 @@ void StunRequestManager::SendDelayed(StunRequest* request, int delay) { |
request->Construct(); |
requests_[request->id()] = request; |
if (delay > 0) { |
- thread_->PostDelayed(RTC_FROM_HERE, delay, request, MSG_STUN_SEND, NULL); |
+ thread_->PostDelayed(RTC_FROM_HERE, delay, request, MSG_STUN_SEND, nullptr); |
} else { |
- thread_->Send(RTC_FROM_HERE, request, MSG_STUN_SEND, NULL); |
+ thread_->Send(RTC_FROM_HERE, request, MSG_STUN_SEND, nullptr); |
} |
} |
@@ -73,7 +73,7 @@ void StunRequestManager::Flush(int msg_type) { |
StunRequest* request = kv.second; |
if (msg_type == kAllRequests || msg_type == request->type()) { |
thread_->Clear(request, MSG_STUN_SEND); |
- thread_->Send(RTC_FROM_HERE, request, MSG_STUN_SEND, NULL); |
+ thread_->Send(RTC_FROM_HERE, request, MSG_STUN_SEND, nullptr); |
} |
} |
} |
@@ -178,7 +178,7 @@ StunRequest::StunRequest(StunMessage* request) |
} |
StunRequest::~StunRequest() { |
- RTC_DCHECK(manager_ != NULL); |
+ RTC_DCHECK(manager_ != nullptr); |
if (manager_) { |
manager_->Remove(this); |
manager_->thread_->Clear(this); |
@@ -198,7 +198,7 @@ void StunRequest::Construct() { |
} |
int StunRequest::type() { |
- RTC_DCHECK(msg_ != NULL); |
+ RTC_DCHECK(msg_ != nullptr); |
return msg_->type(); |
} |
@@ -217,7 +217,7 @@ void StunRequest::set_manager(StunRequestManager* manager) { |
} |
void StunRequest::OnMessage(rtc::Message* pmsg) { |
- RTC_DCHECK(manager_ != NULL); |
+ RTC_DCHECK(manager_ != nullptr); |
RTC_DCHECK(pmsg->message_id == MSG_STUN_SEND); |
if (timeout_) { |
@@ -234,7 +234,7 @@ void StunRequest::OnMessage(rtc::Message* pmsg) { |
OnSent(); |
manager_->thread_->PostDelayed(RTC_FROM_HERE, resend_delay(), this, |
- MSG_STUN_SEND, NULL); |
+ MSG_STUN_SEND, nullptr); |
} |
void StunRequest::OnSent() { |