Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2730)

Unified Diff: extensions/browser/api/socket/socket_api.cc

Issue 2116983002: Change HostResolver::Resolve() to take an std::unique_ptr<Request>* rather than a RequestHandle* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: mmenke's comments and rebasing Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: extensions/browser/api/socket/socket_api.cc
diff --git a/extensions/browser/api/socket/socket_api.cc b/extensions/browser/api/socket/socket_api.cc
index 6534342c8573e8ca1aa9cdfd9ae75d55674d073a..00195f2d1bc7aec34f0df0c09cc0b4cbffc538ce 100644
--- a/extensions/browser/api/socket/socket_api.cc
+++ b/extensions/browser/api/socket/socket_api.cc
@@ -204,16 +204,18 @@ void SocketExtensionWithDnsLookupFunction::StartDnsLookup(
DCHECK(host_resolver);
// RequestHandle is not needed because we never need to cancel requests.
- net::HostResolver::RequestHandle request_handle;
+ std::unique_ptr<net::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.
net::HostResolver::RequestInfo request_info(host_port_pair);
int resolve_result = host_resolver->Resolve(
request_info, net::DEFAULT_PRIORITY, &addresses_,
base::Bind(&SocketExtensionWithDnsLookupFunction::OnDnsLookup, this),
- &request_handle, net::BoundNetLog());
+ &request, net::BoundNetLog());
if (resolve_result != net::ERR_IO_PENDING)
OnDnsLookup(resolve_result);
+ if (resolve_result == net::ERR_IO_PENDING)
+ request_ = std::move(request);
}
void SocketExtensionWithDnsLookupFunction::OnDnsLookup(int resolve_result) {

Powered by Google App Engine
This is Rietveld 408576698