Index: base/memory/weak_ptr.cc |
diff --git a/base/memory/weak_ptr.cc b/base/memory/weak_ptr.cc |
index 321b0576b2555ed995ac8a39c74bd40d944f155f..a22f61aa2ba47e0a8417e40734a23353c96b2eb6 100644 |
--- a/base/memory/weak_ptr.cc |
+++ b/base/memory/weak_ptr.cc |
@@ -40,9 +40,7 @@ WeakReference::WeakReference(const Flag* flag) : flag_(flag) { |
WeakReference::~WeakReference() { |
} |
-bool WeakReference::is_valid() const { |
- return flag_ && flag_->IsValid(); |
-} |
+bool WeakReference::is_valid() const { return flag_.get() && flag_->IsValid(); } |
WeakReferenceOwner::WeakReferenceOwner() { |
} |
@@ -56,11 +54,11 @@ WeakReference WeakReferenceOwner::GetRef() const { |
if (!HasRefs()) |
flag_ = new WeakReference::Flag(); |
- return WeakReference(flag_); |
+ return WeakReference(flag_.get()); |
} |
void WeakReferenceOwner::Invalidate() { |
- if (flag_) { |
+ if (flag_.get()) { |
flag_->Invalidate(); |
flag_ = NULL; |
} |