Remove implicit scoped_refptr operator T*

base/memory/weak_ptr.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/memory/weak_ptr.h"
 
 namespace base {
 namespace internal {
 
 WeakReference::Flag::Flag() : is_valid_(true) {
@@ skipping 17 matching lines @@
 WeakReference::WeakReference() {
 }
 
 WeakReference::WeakReference(const Flag* flag) : flag_(flag) {
 }
 
 WeakReference::~WeakReference() {
 }
 
 bool WeakReference::is_valid() const {
-  return flag_ && flag_->IsValid();
+  return flag_.get() && flag_->IsValid();
 }
 
 WeakReferenceOwner::WeakReferenceOwner() {
 }
 
 WeakReferenceOwner::~WeakReferenceOwner() {
   Invalidate();
 }
 
 WeakReference WeakReferenceOwner::GetRef() const {
   // We also want to reattach to the current thread if all previous references
   // have gone away.
   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;
   }
 }
 
 WeakPtrBase::WeakPtrBase() {
 }
 
 WeakPtrBase::~WeakPtrBase() {
 }
 
 WeakPtrBase::WeakPtrBase(const WeakReference& ref) : ref_(ref) {
 }
 
 }  // namespace internal
 }  // namespace base