Update net/ to use WeakPtr<T>::get() instead of implicit "operator T*"
BUG=245942
Review URL: https://chromiumcodereview.appspot.com/15881011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203633 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/net/dns/host_resolver_impl.cc b/net/dns/host_resolver_impl.cc
index 7845e0b..844c1a73 100644
--- a/net/dns/host_resolver_impl.cc
+++ b/net/dns/host_resolver_impl.cc
@@ -917,7 +917,7 @@
: resolver_(resolver),
net_log_(BoundNetLog::Make(net_log, NetLog::SOURCE_IPV6_PROBE_JOB)),
result_(false, IPV6_SUPPORT_MAX, OK) {
- DCHECK(resolver);
+ DCHECK(resolver.get());
net_log_.BeginEvent(NetLog::TYPE_IPV6_PROBE_RUNNING);
const bool kIsSlow = true;
base::WorkerPool::PostTaskAndReply(
@@ -939,7 +939,7 @@
net_log_.EndEvent(NetLog::TYPE_IPV6_PROBE_RUNNING,
base::Bind(&IPv6SupportResult::ToNetLogValue,
base::Unretained(&result_)));
- if (!resolver_)
+ if (!resolver_.get())
return;
resolver_->IPv6ProbeSetDefaultAddressFamily(
result_.ipv6_supported ? ADDRESS_FAMILY_UNSPECIFIED
@@ -963,7 +963,7 @@
explicit LoopbackProbeJob(const base::WeakPtr<HostResolverImpl>& resolver)
: resolver_(resolver),
result_(false) {
- DCHECK(resolver);
+ DCHECK(resolver.get());
const bool kIsSlow = true;
base::WorkerPool::PostTaskAndReply(
FROM_HERE,
@@ -981,7 +981,7 @@
}
void OnProbeComplete() {
- if (!resolver_)
+ if (!resolver_.get())
return;
resolver_->SetHaveOnlyLoopbackAddresses(result_);
}
@@ -1543,7 +1543,7 @@
// Performs Job's last rites. Completes all Requests. Deletes this.
void CompleteRequests(const HostCache::Entry& entry,
base::TimeDelta ttl) {
- CHECK(resolver_);
+ CHECK(resolver_.get());
// This job must be removed from resolver's |jobs_| now to make room for a
// new job with the same key in case one of the OnComplete callbacks decides
@@ -1613,7 +1613,7 @@
// Check if the resolver was destroyed as a result of running the
// callback. If it was, we could continue, but we choose to bail.
- if (!resolver_)
+ if (!resolver_.get())
return;
}
}
@@ -2116,7 +2116,7 @@
base::WeakPtr<HostResolverImpl> self = weak_ptr_factory_.GetWeakPtr();
// Then Abort them.
- for (size_t i = 0; self && i < jobs_to_abort.size(); ++i) {
+ for (size_t i = 0; self.get() && i < jobs_to_abort.size(); ++i) {
jobs_to_abort[i]->Abort();
jobs_to_abort[i] = NULL;
}
@@ -2132,7 +2132,7 @@
// Life check to bail once |this| is deleted.
base::WeakPtr<HostResolverImpl> self = weak_ptr_factory_.GetWeakPtr();
- for (JobMap::iterator it = jobs_.begin(); self && it != jobs_.end(); ) {
+ for (JobMap::iterator it = jobs_.begin(); self.get() && it != jobs_.end();) {
Job* job = it->second;
++it;
// This could remove |job| from |jobs_|, but iterator will remain valid.
@@ -2193,7 +2193,7 @@
AbortAllInProgressJobs();
// |this| may be deleted inside AbortAllInProgressJobs().
- if (self)
+ if (self.get())
TryServingAllJobsFromHosts();
}
