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

Unified Diff: net/dns/mojo_host_resolver_impl.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: http_stream_factory_impl_job_controller_unittest RequestHandle* to unique_ptr 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: net/dns/mojo_host_resolver_impl.cc
diff --git a/net/dns/mojo_host_resolver_impl.cc b/net/dns/mojo_host_resolver_impl.cc
index 13f61d51dd4d60d727e90313e153fc35a890f9be..ee01defb44900944e3b06ffc9fae9e359bb6aa8e 100644
--- a/net/dns/mojo_host_resolver_impl.cc
+++ b/net/dns/mojo_host_resolver_impl.cc
@@ -41,7 +41,7 @@ class MojoHostResolverImpl::Job {
net::HostResolver::RequestInfo request_info_;
const BoundNetLog net_log_;
interfaces::HostResolverRequestClientPtr client_;
- net::HostResolver::RequestHandle handle_;
+ std::unique_ptr<net::HostResolver::Request> request_;
AddressList result_;
base::ThreadChecker thread_checker_;
};
@@ -91,8 +91,7 @@ MojoHostResolverImpl::Job::Job(
resolver_(resolver),
request_info_(request_info),
net_log_(net_log),
- client_(std::move(client)),
- handle_(nullptr) {
+ client_(std::move(client)) {
client_.set_connection_error_handler(base::Bind(
&MojoHostResolverImpl::Job::OnConnectionError, base::Unretained(this)));
}
@@ -103,21 +102,18 @@ void MojoHostResolverImpl::Job::Start() {
resolver_->Resolve(request_info_, DEFAULT_PRIORITY, &result_,
base::Bind(&MojoHostResolverImpl::Job::OnResolveDone,
base::Unretained(this)),
- &handle_, net_log_);
+ &request_, net_log_);
if (result != ERR_IO_PENDING)
OnResolveDone(result);
}
MojoHostResolverImpl::Job::~Job() {
- DCHECK(thread_checker_.CalledOnValidThread());
- if (handle_)
- resolver_->CancelRequest(handle_);
}
void MojoHostResolverImpl::Job::OnResolveDone(int result) {
DCHECK(thread_checker_.CalledOnValidThread());
- handle_ = nullptr;
+ request_.reset();
DVLOG(1) << "Resolved " << request_info_.host_port_pair().ToString()
<< " with error " << result << " and " << result_.size()
<< " results!";

Powered by Google App Engine
This is Rietveld 408576698