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

Unified Diff: net/socket/transport_client_socket_pool.cc

Issue 2214693002: First step to remove SingleRequestHostResolver. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixing host resolver ~Job Created 4 years, 4 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: net/socket/transport_client_socket_pool.cc
diff --git a/net/socket/transport_client_socket_pool.cc b/net/socket/transport_client_socket_pool.cc
index 88d51e239ba15aaa97230fe13b7b7cf08d258c0d..2365ec9054b0a1f6ecd4d0cb08ba0c02a3c045a9 100644
--- a/net/socket/transport_client_socket_pool.cc
+++ b/net/socket/transport_client_socket_pool.cc
@@ -117,7 +117,7 @@ TransportConnectJob::TransportConnectJob(
TransportConnectJob::~TransportConnectJob() {
// We don't worry about cancelling the host resolution and TCP connect, since
- // ~SingleRequestHostResolver and ~StreamSocket will take care of it.
+ // ~HostResolver and ~StreamSocket will take care of it.
mmenke 2016/08/10 14:33:33 ~HostResolver -> ~HostResolver::Request
maksims (do not use this acc) 2016/08/12 04:55:33 Done.
}
LoadState TransportConnectJob::GetLoadState() const {
@@ -268,10 +268,10 @@ int TransportConnectJob::DoResolveHost() {
next_state_ = STATE_RESOLVE_HOST_COMPLETE;
connect_timing_.dns_start = base::TimeTicks::Now();
- return resolver_.Resolve(
+ return resolver_->Resolve(
params_->destination(), priority(), &addresses_,
base::Bind(&TransportConnectJob::OnIOComplete, base::Unretained(this)),
- net_log());
+ &request_, net_log());
}
int TransportConnectJob::DoResolveHostComplete(int result) {

Powered by Google App Engine
This is Rietveld 408576698