Chromium Code Reviews| Index: chrome/browser/devtools/device/tcp_device_provider.cc |
| diff --git a/chrome/browser/devtools/device/tcp_device_provider.cc b/chrome/browser/devtools/device/tcp_device_provider.cc |
| index 33eb767cf52b66f10cb2839fb0c21d3cc60893bd..cddd826937064d3846358d1c0b2f6590deb80cc4 100644 |
| --- a/chrome/browser/devtools/device/tcp_device_provider.cc |
| +++ b/chrome/browser/devtools/device/tcp_device_provider.cc |
| @@ -36,13 +36,16 @@ class ResolveHostAndOpenSocket final { |
| : callback_(callback) { |
| host_resolver_ = net::HostResolver::CreateDefaultResolver(nullptr); |
| net::HostResolver::RequestInfo request_info(address); |
| + std::unique_ptr<net::HostResolver::Request> request; |
|
mmenke
2016/07/21 16:00:40
Not needed (Note that there's also a bug below - y
maksims (do not use this acc)
2016/07/22 10:16:00
Ops...
|
| int result = host_resolver_->Resolve( |
| request_info, net::DEFAULT_PRIORITY, &address_list_, |
| base::Bind(&ResolveHostAndOpenSocket::OnResolved, |
| base::Unretained(this)), |
| - nullptr, net::BoundNetLog()); |
| + &request_, net::BoundNetLog()); |
| if (result != net::ERR_IO_PENDING) |
| OnResolved(result); |
| + else if (result == net::ERR_IO_PENDING) |
| + request_ = std::move(request); |
| } |
| private: |
| @@ -60,6 +63,7 @@ class ResolveHostAndOpenSocket final { |
| } |
| std::unique_ptr<net::HostResolver> host_resolver_; |
| + std::unique_ptr<net::HostResolver::Request> request_; |
| net::AddressList address_list_; |
| AdbClientSocket::SocketCallback callback_; |
| }; |