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

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: 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 714766bcd9fd03b5e54b9fc90531112dd92dc9e0..e38a11fe3f24c218dd3f9d48150c2f91eaec805e 100644
--- a/extensions/browser/api/socket/socket_api.cc
+++ b/extensions/browser/api/socket/socket_api.cc
@@ -203,14 +203,11 @@ void SocketExtensionWithDnsLookupFunction::StartDnsLookup(
HostResolverWrapper::GetInstance()->GetHostResolver(resource_context_);
DCHECK(host_resolver);
- // RequestHandle is not needed because we never need to cancel requests.
- net::HostResolver::RequestHandle request_handle;
-
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_handle_, net::BoundNetLog());
if (resolve_result != net::ERR_IO_PENDING)
OnDnsLookup(resolve_result);
@@ -333,6 +330,9 @@ void SocketConnectFunction::AfterDnsLookup(int lookup_result) {
SetResult(base::MakeUnique<base::FundamentalValue>(lookup_result));
AsyncWorkCompleted();
}
+ // TODO(maksims): investigate why std::unique_ptr<HostResolver::Request>'s
+ // destructor is not called automatically.
+ request_handle_.reset();
Devlin 2016/07/12 15:04:51 ditto
maksims (do not use this acc) 2016/07/19 15:00:25 Done.
}
void SocketConnectFunction::StartConnect() {
@@ -665,6 +665,10 @@ void SocketSendToFunction::AfterDnsLookup(int lookup_result) {
SetResult(base::MakeUnique<base::FundamentalValue>(lookup_result));
AsyncWorkCompleted();
}
+
+ // TODO(maksims): investigate why std::unique_ptr<HostResolver::Request>'s
+ // destructor is not called automatically.
+ request_handle_.reset();
}
void SocketSendToFunction::StartSendTo() {

Powered by Google App Engine
This is Rietveld 408576698