Chromium Code Reviews| Index: net/tools/gdig/gdig.cc |
| diff --git a/net/tools/gdig/gdig.cc b/net/tools/gdig/gdig.cc |
| index f3d84e31b49a3bbd60f4b7160085c37134b4f0fe..f4109adb05936cb7bf912c2ae273362a9102a69a 100644 |
| --- a/net/tools/gdig/gdig.cc |
| +++ b/net/tools/gdig/gdig.cc |
| @@ -231,6 +231,7 @@ class GDig { |
| std::unique_ptr<FileNetLogObserver> log_observer_; |
| std::unique_ptr<NetLog> log_; |
| std::unique_ptr<HostResolver> resolver_; |
| + std::unique_ptr<HostResolver::Request> request_; |
| #if defined(OS_MACOSX) |
| // Without this there will be a mem leak on osx. |
| @@ -465,17 +466,16 @@ void GDig::ReplayNextEntry() { |
| current_index, |
| base::Owned(addrlist), |
| time_since_start); |
| + std::unique_ptr<HostResolver::Request> request; |
|
mmenke
2016/07/21 16:00:40
Not needed.
maksims (do not use this acc)
2016/07/22 10:16:00
Done.
|
| ++active_resolves_; |
| ++replay_log_index_; |
| int ret = resolver_->Resolve( |
| - info, |
| - DEFAULT_PRIORITY, |
| - addrlist, |
| - callback, |
| - NULL, |
| + info, DEFAULT_PRIORITY, addrlist, callback, &request, |
| BoundNetLog::Make(log_.get(), net::NetLog::SOURCE_NONE)); |
| if (ret != ERR_IO_PENDING) |
| callback.Run(ret); |
| + else if (ret == ERR_IO_PENDING) |
| + request_ = std::move(request); |
| } |
| } |