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

Unified Diff: net/dns/host_resolver_impl.cc

Issue 15829004: Update net/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: license twerk Created 7 years, 7 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
« no previous file with comments | « net/dns/dns_transaction.cc ('k') | net/dns/host_resolver_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/dns/host_resolver_impl.cc
diff --git a/net/dns/host_resolver_impl.cc b/net/dns/host_resolver_impl.cc
index 0f00ceb23dda630887869f46dcdcd3af116b04a9..7845e0bee8e6cfebc494f84f746a3d93e69fa0ec 100644
--- a/net/dns/host_resolver_impl.cc
+++ b/net/dns/host_resolver_impl.cc
@@ -562,10 +562,10 @@ class HostResolverImpl::ProcTask
completed_attempt_error_(ERR_UNEXPECTED),
had_non_speculative_request_(false),
net_log_(job_net_log) {
- if (!params_.resolver_proc)
+ if (!params_.resolver_proc.get())
params_.resolver_proc = HostResolverProc::GetDefault();
// If default is unset, use the system proc.
- if (!params_.resolver_proc)
+ if (!params_.resolver_proc.get())
params_.resolver_proc = new SystemHostResolverProc();
}
@@ -1260,7 +1260,7 @@ class HostResolverImpl::Job : public PrioritizedDispatcher::Job {
// TODO(szym): Check if this is still needed.
if (!req->info().is_speculative()) {
had_non_speculative_request_ = true;
- if (proc_task_)
+ if (proc_task_.get())
proc_task_->set_had_non_speculative_request();
}
@@ -2202,9 +2202,8 @@ bool HostResolverImpl::HaveDnsConfig() const {
// ScopedDefaultHostResolverProc.
// The alternative is to use NetworkChangeNotifier to override DnsConfig,
// but that would introduce construction order requirements for NCN and SDHRP.
- return (dns_client_.get() != NULL) &&
- (dns_client_->GetConfig() != NULL) &&
- !(proc_params_.resolver_proc == NULL &&
+ return (dns_client_.get() != NULL) && (dns_client_->GetConfig() != NULL) &&
+ !(proc_params_.resolver_proc.get() == NULL &&
HostResolverProc::GetDefault() != NULL);
}
« no previous file with comments | « net/dns/dns_transaction.cc ('k') | net/dns/host_resolver_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698