Chromium Code Reviews| Index: webrtc/p2p/base/turnport.cc |
| diff --git a/webrtc/p2p/base/turnport.cc b/webrtc/p2p/base/turnport.cc |
| index e3caeb59d3e6b43c93310f10f25866aa45f47eea..fff0d8c974e3faf751b5766bbe097e31dc84fb7a 100644 |
| --- a/webrtc/p2p/base/turnport.cc |
| +++ b/webrtc/p2p/base/turnport.cc |
| @@ -200,7 +200,7 @@ TurnPort::TurnPort(rtc::Thread* thread, |
| server_address_(server_address), |
| credentials_(credentials), |
| socket_(socket), |
| - resolver_(NULL), |
| + resolver_(), |
|
tommi
2017/06/19 13:01:47
nit: remove from the initializer list since it'll
nisse-webrtc
2017/06/19 14:07:20
Done. Here and below.
|
| error_(0), |
| request_manager_(thread), |
| next_channel_number_(TURN_CHANNEL_NUMBER_START), |
| @@ -235,7 +235,7 @@ TurnPort::TurnPort(rtc::Thread* thread, |
| server_address_(server_address), |
| credentials_(credentials), |
| socket_(NULL), |
| - resolver_(NULL), |
| + resolver_(), |
|
tommi
2017/06/19 13:01:47
nit: remove (we don't include default constructed
|
| error_(0), |
| request_manager_(thread), |
| next_channel_number_(TURN_CHANNEL_NUMBER_START), |
| @@ -679,13 +679,13 @@ void TurnPort::ResolveTurnAddress(const rtc::SocketAddress& address) { |
| LOG_J(LS_INFO, this) << "Starting TURN host lookup for " |
| << address.ToSensitiveString(); |
| - resolver_ = socket_factory()->CreateAsyncResolver(); |
| + resolver_ = rtc::WrapUnique(socket_factory()->CreateAsyncResolver()); |
| resolver_->SignalDone.connect(this, &TurnPort::OnResolveResult); |
| resolver_->Start(address); |
| } |
| void TurnPort::OnResolveResult(rtc::AsyncResolverInterface* resolver) { |
| - RTC_DCHECK(resolver == resolver_); |
| + RTC_DCHECK(resolver == resolver_.get()); |
| // If DNS resolve is failed when trying to connect to the server using TCP, |
| // one of the reason could be due to DNS queries blocked by firewall. |
| // In such cases we will try to connect to the server with hostname, assuming |