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

Unified Diff: chrome/browser/devtools/device/port_forwarding_controller.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: chrome/browser/devtools/device/port_forwarding_controller.cc
diff --git a/chrome/browser/devtools/device/port_forwarding_controller.cc b/chrome/browser/devtools/device/port_forwarding_controller.cc
index 459e5c3fcbb3147890fdc2378aafffb78fb6b5de..87b2764cc0c187feff7c22119a33d1b5b8f96cc3 100644
--- a/chrome/browser/devtools/device/port_forwarding_controller.cc
+++ b/chrome/browser/devtools/device/port_forwarding_controller.cc
@@ -66,15 +66,15 @@ class SocketTunnel : public base::NonThreadSafe {
pending_destruction_(false) {
host_resolver_ = net::HostResolver::CreateDefaultResolver(nullptr);
net::HostResolver::RequestInfo request_info(net::HostPortPair(host, port));
+ std::unique_ptr<net::HostResolver::Request> request;
mmenke 2016/07/21 16:00:40 You don't need this - if result != ERR_IO_PENDING,
maksims (do not use this acc) 2016/07/22 10:16:00 Done.
int result = host_resolver_->Resolve(
- request_info,
- net::DEFAULT_PRIORITY,
- &address_list_,
- base::Bind(&SocketTunnel::OnResolved, base::Unretained(this)),
- nullptr,
+ request_info, net::DEFAULT_PRIORITY, &address_list_,
+ base::Bind(&SocketTunnel::OnResolved, base::Unretained(this)), &request,
net::BoundNetLog());
if (result != net::ERR_IO_PENDING)
OnResolved(result);
+ else if (result == net::ERR_IO_PENDING)
+ request_ = std::move(request);
}
void OnResolved(int result) {
@@ -186,6 +186,7 @@ class SocketTunnel : public base::NonThreadSafe {
std::unique_ptr<net::StreamSocket> remote_socket_;
std::unique_ptr<net::StreamSocket> host_socket_;
std::unique_ptr<net::HostResolver> host_resolver_;
+ std::unique_ptr<net::HostResolver::Request> request_;
net::AddressList address_list_;
int pending_writes_;
bool pending_destruction_;

Powered by Google App Engine
This is Rietveld 408576698