| Index: base/memory/ref_counted_unittest.cc
 | 
| diff --git a/base/memory/ref_counted_unittest.cc b/base/memory/ref_counted_unittest.cc
 | 
| index f75cd38f19c86d530237200e37792a2cde9480eb..6f8e599cbdc970728d4a035528f68a4eb69acd9c 100644
 | 
| --- a/base/memory/ref_counted_unittest.cc
 | 
| +++ b/base/memory/ref_counted_unittest.cc
 | 
| @@ -40,19 +40,71 @@ class ScopedRefPtrToSelf : public base::RefCounted<ScopedRefPtrToSelf> {
 | 
|  
 | 
|    static bool was_destroyed() { return was_destroyed_; }
 | 
|  
 | 
| -  void SelfDestruct() { self_ptr_ = NULL; }
 | 
| +  static void reset_was_destroyed() { was_destroyed_ = false; }
 | 
| +
 | 
| +  scoped_refptr<ScopedRefPtrToSelf> self_ptr_;
 | 
|  
 | 
|   private:
 | 
|    friend class base::RefCounted<ScopedRefPtrToSelf>;
 | 
|    ~ScopedRefPtrToSelf() { was_destroyed_ = true; }
 | 
|  
 | 
|    static bool was_destroyed_;
 | 
| -
 | 
| -  scoped_refptr<ScopedRefPtrToSelf> self_ptr_;
 | 
|  };
 | 
|  
 | 
|  bool ScopedRefPtrToSelf::was_destroyed_ = false;
 | 
|  
 | 
| +class ScopedRefPtrCountBase : public base::RefCounted<ScopedRefPtrCountBase> {
 | 
| + public:
 | 
| +  ScopedRefPtrCountBase() { ++constructor_count_; }
 | 
| +
 | 
| +  static int constructor_count() { return constructor_count_; }
 | 
| +
 | 
| +  static int destructor_count() { return destructor_count_; }
 | 
| +
 | 
| +  static void reset_count() {
 | 
| +    constructor_count_ = 0;
 | 
| +    destructor_count_ = 0;
 | 
| +  }
 | 
| +
 | 
| + protected:
 | 
| +  virtual ~ScopedRefPtrCountBase() { ++destructor_count_; }
 | 
| +
 | 
| + private:
 | 
| +  friend class base::RefCounted<ScopedRefPtrCountBase>;
 | 
| +
 | 
| +  static int constructor_count_;
 | 
| +  static int destructor_count_;
 | 
| +};
 | 
| +
 | 
| +int ScopedRefPtrCountBase::constructor_count_ = 0;
 | 
| +int ScopedRefPtrCountBase::destructor_count_ = 0;
 | 
| +
 | 
| +class ScopedRefPtrCountDerived : public ScopedRefPtrCountBase {
 | 
| + public:
 | 
| +  ScopedRefPtrCountDerived() { ++constructor_count_; }
 | 
| +
 | 
| +  static int constructor_count() { return constructor_count_; }
 | 
| +
 | 
| +  static int destructor_count() { return destructor_count_; }
 | 
| +
 | 
| +  static void reset_count() {
 | 
| +    constructor_count_ = 0;
 | 
| +    destructor_count_ = 0;
 | 
| +  }
 | 
| +
 | 
| + protected:
 | 
| +  ~ScopedRefPtrCountDerived() override { ++destructor_count_; }
 | 
| +
 | 
| + private:
 | 
| +  friend class base::RefCounted<ScopedRefPtrCountDerived>;
 | 
| +
 | 
| +  static int constructor_count_;
 | 
| +  static int destructor_count_;
 | 
| +};
 | 
| +
 | 
| +int ScopedRefPtrCountDerived::constructor_count_ = 0;
 | 
| +int ScopedRefPtrCountDerived::destructor_count_ = 0;
 | 
| +
 | 
|  }  // end namespace
 | 
|  
 | 
|  TEST(RefCountedUnitTest, TestSelfAssignment) {
 | 
| @@ -66,10 +118,24 @@ TEST(RefCountedUnitTest, ScopedRefPtrMemberAccess) {
 | 
|    CheckDerivedMemberAccess check;
 | 
|  }
 | 
|  
 | 
| -TEST(RefCountedUnitTest, ScopedRefPtrToSelf) {
 | 
| +TEST(RefCountedUnitTest, ScopedRefPtrToSelfPointerAssignment) {
 | 
| +  ScopedRefPtrToSelf::reset_was_destroyed();
 | 
| +
 | 
|    ScopedRefPtrToSelf* check = new ScopedRefPtrToSelf();
 | 
|    EXPECT_FALSE(ScopedRefPtrToSelf::was_destroyed());
 | 
| -  check->SelfDestruct();
 | 
| +  check->self_ptr_ = nullptr;
 | 
| +  EXPECT_TRUE(ScopedRefPtrToSelf::was_destroyed());
 | 
| +}
 | 
| +
 | 
| +TEST(RefCountedUnitTest, ScopedRefPtrToSelfMoveAssignment) {
 | 
| +  ScopedRefPtrToSelf::reset_was_destroyed();
 | 
| +
 | 
| +  ScopedRefPtrToSelf* check = new ScopedRefPtrToSelf();
 | 
| +  EXPECT_FALSE(ScopedRefPtrToSelf::was_destroyed());
 | 
| +  // Releasing |check->self_ptr_| will delete |check|.
 | 
| +  // The move assignment operator must assign |check->self_ptr_| first then
 | 
| +  // release |check->self_ptr_|.
 | 
| +  check->self_ptr_ = scoped_refptr<ScopedRefPtrToSelf>();
 | 
|    EXPECT_TRUE(ScopedRefPtrToSelf::was_destroyed());
 | 
|  }
 | 
|  
 | 
| @@ -113,3 +179,284 @@ TEST(RefCountedUnitTest, ConvertibleEquality) {
 | 
|    EXPECT_EQ(p1, p2);
 | 
|    EXPECT_EQ(p2, p1);
 | 
|  }
 | 
| +
 | 
| +TEST(RefCountedUnitTest, SelfMoveAssignment) {
 | 
| +  ScopedRefPtrCountBase::reset_count();
 | 
| +
 | 
| +  {
 | 
| +    ScopedRefPtrCountBase *raw = new ScopedRefPtrCountBase();
 | 
| +    scoped_refptr<ScopedRefPtrCountBase> p(raw);
 | 
| +    EXPECT_EQ(1, ScopedRefPtrCountBase::constructor_count());
 | 
| +    EXPECT_EQ(0, ScopedRefPtrCountBase::destructor_count());
 | 
| +
 | 
| +    p = p.Pass();
 | 
| +    EXPECT_EQ(1, ScopedRefPtrCountBase::constructor_count());
 | 
| +    EXPECT_EQ(0, ScopedRefPtrCountBase::destructor_count());
 | 
| +    EXPECT_EQ(raw, p.get());
 | 
| +
 | 
| +    // p goes out of scope.
 | 
| +  }
 | 
| +  EXPECT_EQ(1, ScopedRefPtrCountBase::constructor_count());
 | 
| +  EXPECT_EQ(1, ScopedRefPtrCountBase::destructor_count());
 | 
| +}
 | 
| +
 | 
| +TEST(RefCountedUnitTest, MoveAssignment1) {
 | 
| +  ScopedRefPtrCountBase::reset_count();
 | 
| +
 | 
| +  {
 | 
| +    ScopedRefPtrCountBase *raw = new ScopedRefPtrCountBase();
 | 
| +    scoped_refptr<ScopedRefPtrCountBase> p1(raw);
 | 
| +    EXPECT_EQ(1, ScopedRefPtrCountBase::constructor_count());
 | 
| +    EXPECT_EQ(0, ScopedRefPtrCountBase::destructor_count());
 | 
| +
 | 
| +    {
 | 
| +      scoped_refptr<ScopedRefPtrCountBase> p2;
 | 
| +
 | 
| +      p2 = p1.Pass();
 | 
| +      EXPECT_EQ(1, ScopedRefPtrCountBase::constructor_count());
 | 
| +      EXPECT_EQ(0, ScopedRefPtrCountBase::destructor_count());
 | 
| +      EXPECT_EQ(nullptr, p1.get());
 | 
| +      EXPECT_EQ(raw, p2.get());
 | 
| +
 | 
| +      // p2 goes out of scope.
 | 
| +    }
 | 
| +    EXPECT_EQ(1, ScopedRefPtrCountBase::constructor_count());
 | 
| +    EXPECT_EQ(1, ScopedRefPtrCountBase::destructor_count());
 | 
| +
 | 
| +    // p1 goes out of scope.
 | 
| +  }
 | 
| +  EXPECT_EQ(1, ScopedRefPtrCountBase::constructor_count());
 | 
| +  EXPECT_EQ(1, ScopedRefPtrCountBase::destructor_count());
 | 
| +}
 | 
| +
 | 
| +TEST(RefCountedUnitTest, MoveAssignment2) {
 | 
| +  ScopedRefPtrCountBase::reset_count();
 | 
| +
 | 
| +  {
 | 
| +    ScopedRefPtrCountBase *raw = new ScopedRefPtrCountBase();
 | 
| +    scoped_refptr<ScopedRefPtrCountBase> p1;
 | 
| +    EXPECT_EQ(1, ScopedRefPtrCountBase::constructor_count());
 | 
| +    EXPECT_EQ(0, ScopedRefPtrCountBase::destructor_count());
 | 
| +
 | 
| +    {
 | 
| +      scoped_refptr<ScopedRefPtrCountBase> p2(raw);
 | 
| +      EXPECT_EQ(1, ScopedRefPtrCountBase::constructor_count());
 | 
| +      EXPECT_EQ(0, ScopedRefPtrCountBase::destructor_count());
 | 
| +
 | 
| +      p1 = p2.Pass();
 | 
| +      EXPECT_EQ(1, ScopedRefPtrCountBase::constructor_count());
 | 
| +      EXPECT_EQ(0, ScopedRefPtrCountBase::destructor_count());
 | 
| +      EXPECT_EQ(raw, p1.get());
 | 
| +      EXPECT_EQ(nullptr, p2.get());
 | 
| +
 | 
| +      // p2 goes out of scope.
 | 
| +    }
 | 
| +    EXPECT_EQ(1, ScopedRefPtrCountBase::constructor_count());
 | 
| +    EXPECT_EQ(0, ScopedRefPtrCountBase::destructor_count());
 | 
| +
 | 
| +    // p1 goes out of scope.
 | 
| +  }
 | 
| +  EXPECT_EQ(1, ScopedRefPtrCountBase::constructor_count());
 | 
| +  EXPECT_EQ(1, ScopedRefPtrCountBase::destructor_count());
 | 
| +}
 | 
| +
 | 
| +TEST(RefCountedUnitTest, MoveAssignmentSameInstance1) {
 | 
| +  ScopedRefPtrCountBase::reset_count();
 | 
| +
 | 
| +  {
 | 
| +    ScopedRefPtrCountBase *raw = new ScopedRefPtrCountBase();
 | 
| +    scoped_refptr<ScopedRefPtrCountBase> p1(raw);
 | 
| +    EXPECT_EQ(1, ScopedRefPtrCountBase::constructor_count());
 | 
| +    EXPECT_EQ(0, ScopedRefPtrCountBase::destructor_count());
 | 
| +
 | 
| +    {
 | 
| +      scoped_refptr<ScopedRefPtrCountBase> p2(p1);
 | 
| +      EXPECT_EQ(1, ScopedRefPtrCountBase::constructor_count());
 | 
| +      EXPECT_EQ(0, ScopedRefPtrCountBase::destructor_count());
 | 
| +
 | 
| +      p1 = p2.Pass();
 | 
| +      EXPECT_EQ(1, ScopedRefPtrCountBase::constructor_count());
 | 
| +      EXPECT_EQ(0, ScopedRefPtrCountBase::destructor_count());
 | 
| +      EXPECT_EQ(raw, p1.get());
 | 
| +      EXPECT_EQ(nullptr, p2.get());
 | 
| +
 | 
| +      // p2 goes out of scope.
 | 
| +    }
 | 
| +    EXPECT_EQ(1, ScopedRefPtrCountBase::constructor_count());
 | 
| +    EXPECT_EQ(0, ScopedRefPtrCountBase::destructor_count());
 | 
| +
 | 
| +    // p1 goes out of scope.
 | 
| +  }
 | 
| +  EXPECT_EQ(1, ScopedRefPtrCountBase::constructor_count());
 | 
| +  EXPECT_EQ(1, ScopedRefPtrCountBase::destructor_count());
 | 
| +}
 | 
| +
 | 
| +TEST(RefCountedUnitTest, MoveAssignmentSameInstance2) {
 | 
| +  ScopedRefPtrCountBase::reset_count();
 | 
| +
 | 
| +  {
 | 
| +    ScopedRefPtrCountBase *raw = new ScopedRefPtrCountBase();
 | 
| +    scoped_refptr<ScopedRefPtrCountBase> p1(raw);
 | 
| +    EXPECT_EQ(1, ScopedRefPtrCountBase::constructor_count());
 | 
| +    EXPECT_EQ(0, ScopedRefPtrCountBase::destructor_count());
 | 
| +
 | 
| +    {
 | 
| +      scoped_refptr<ScopedRefPtrCountBase> p2(p1);
 | 
| +      EXPECT_EQ(1, ScopedRefPtrCountBase::constructor_count());
 | 
| +      EXPECT_EQ(0, ScopedRefPtrCountBase::destructor_count());
 | 
| +
 | 
| +      p2 = p1.Pass();
 | 
| +      EXPECT_EQ(1, ScopedRefPtrCountBase::constructor_count());
 | 
| +      EXPECT_EQ(0, ScopedRefPtrCountBase::destructor_count());
 | 
| +      EXPECT_EQ(nullptr, p1.get());
 | 
| +      EXPECT_EQ(raw, p2.get());
 | 
| +
 | 
| +      // p2 goes out of scope.
 | 
| +    }
 | 
| +    EXPECT_EQ(1, ScopedRefPtrCountBase::constructor_count());
 | 
| +    EXPECT_EQ(1, ScopedRefPtrCountBase::destructor_count());
 | 
| +
 | 
| +    // p1 goes out of scope.
 | 
| +  }
 | 
| +  EXPECT_EQ(1, ScopedRefPtrCountBase::constructor_count());
 | 
| +  EXPECT_EQ(1, ScopedRefPtrCountBase::destructor_count());
 | 
| +}
 | 
| +
 | 
| +TEST(RefCountedUnitTest, MoveAssignmentDifferentInstances) {
 | 
| +  ScopedRefPtrCountBase::reset_count();
 | 
| +
 | 
| +  {
 | 
| +    ScopedRefPtrCountBase *raw1 = new ScopedRefPtrCountBase();
 | 
| +    scoped_refptr<ScopedRefPtrCountBase> p1(raw1);
 | 
| +    EXPECT_EQ(1, ScopedRefPtrCountBase::constructor_count());
 | 
| +    EXPECT_EQ(0, ScopedRefPtrCountBase::destructor_count());
 | 
| +
 | 
| +    {
 | 
| +      ScopedRefPtrCountBase *raw2 = new ScopedRefPtrCountBase();
 | 
| +      scoped_refptr<ScopedRefPtrCountBase> p2(raw2);
 | 
| +      EXPECT_EQ(2, ScopedRefPtrCountBase::constructor_count());
 | 
| +      EXPECT_EQ(0, ScopedRefPtrCountBase::destructor_count());
 | 
| +
 | 
| +      p1 = p2.Pass();
 | 
| +      EXPECT_EQ(2, ScopedRefPtrCountBase::constructor_count());
 | 
| +      EXPECT_EQ(1, ScopedRefPtrCountBase::destructor_count());
 | 
| +      EXPECT_EQ(raw2, p1.get());
 | 
| +      EXPECT_EQ(nullptr, p2.get());
 | 
| +
 | 
| +      // p2 goes out of scope.
 | 
| +    }
 | 
| +    EXPECT_EQ(2, ScopedRefPtrCountBase::constructor_count());
 | 
| +    EXPECT_EQ(1, ScopedRefPtrCountBase::destructor_count());
 | 
| +
 | 
| +    // p1 goes out of scope.
 | 
| +  }
 | 
| +  EXPECT_EQ(2, ScopedRefPtrCountBase::constructor_count());
 | 
| +  EXPECT_EQ(2, ScopedRefPtrCountBase::destructor_count());
 | 
| +}
 | 
| +
 | 
| +TEST(RefCountedUnitTest, MoveAssignmentDerived) {
 | 
| +  ScopedRefPtrCountBase::reset_count();
 | 
| +  ScopedRefPtrCountDerived::reset_count();
 | 
| +
 | 
| +  {
 | 
| +    ScopedRefPtrCountBase *raw1 = new ScopedRefPtrCountBase();
 | 
| +    scoped_refptr<ScopedRefPtrCountBase> p1(raw1);
 | 
| +    EXPECT_EQ(1, ScopedRefPtrCountBase::constructor_count());
 | 
| +    EXPECT_EQ(0, ScopedRefPtrCountBase::destructor_count());
 | 
| +    EXPECT_EQ(0, ScopedRefPtrCountDerived::constructor_count());
 | 
| +    EXPECT_EQ(0, ScopedRefPtrCountDerived::destructor_count());
 | 
| +
 | 
| +    {
 | 
| +      ScopedRefPtrCountDerived *raw2 = new ScopedRefPtrCountDerived();
 | 
| +      scoped_refptr<ScopedRefPtrCountDerived> p2(raw2);
 | 
| +      EXPECT_EQ(2, ScopedRefPtrCountBase::constructor_count());
 | 
| +      EXPECT_EQ(0, ScopedRefPtrCountBase::destructor_count());
 | 
| +      EXPECT_EQ(1, ScopedRefPtrCountDerived::constructor_count());
 | 
| +      EXPECT_EQ(0, ScopedRefPtrCountDerived::destructor_count());
 | 
| +
 | 
| +      p1 = p2.Pass();
 | 
| +      EXPECT_EQ(2, ScopedRefPtrCountBase::constructor_count());
 | 
| +      EXPECT_EQ(1, ScopedRefPtrCountBase::destructor_count());
 | 
| +      EXPECT_EQ(1, ScopedRefPtrCountDerived::constructor_count());
 | 
| +      EXPECT_EQ(0, ScopedRefPtrCountDerived::destructor_count());
 | 
| +      EXPECT_EQ(raw2, p1.get());
 | 
| +      EXPECT_EQ(nullptr, p2.get());
 | 
| +
 | 
| +      // p2 goes out of scope.
 | 
| +    }
 | 
| +    EXPECT_EQ(2, ScopedRefPtrCountBase::constructor_count());
 | 
| +    EXPECT_EQ(1, ScopedRefPtrCountBase::destructor_count());
 | 
| +    EXPECT_EQ(1, ScopedRefPtrCountDerived::constructor_count());
 | 
| +    EXPECT_EQ(0, ScopedRefPtrCountDerived::destructor_count());
 | 
| +
 | 
| +    // p1 goes out of scope.
 | 
| +  }
 | 
| +  EXPECT_EQ(2, ScopedRefPtrCountBase::constructor_count());
 | 
| +  EXPECT_EQ(2, ScopedRefPtrCountBase::destructor_count());
 | 
| +  EXPECT_EQ(1, ScopedRefPtrCountDerived::constructor_count());
 | 
| +  EXPECT_EQ(1, ScopedRefPtrCountDerived::destructor_count());
 | 
| +}
 | 
| +
 | 
| +TEST(RefCountedUnitTest, MoveConstructor) {
 | 
| +  ScopedRefPtrCountBase::reset_count();
 | 
| +
 | 
| +  {
 | 
| +    ScopedRefPtrCountBase *raw = new ScopedRefPtrCountBase();
 | 
| +    scoped_refptr<ScopedRefPtrCountBase> p1(raw);
 | 
| +    EXPECT_EQ(1, ScopedRefPtrCountBase::constructor_count());
 | 
| +    EXPECT_EQ(0, ScopedRefPtrCountBase::destructor_count());
 | 
| +
 | 
| +    {
 | 
| +      scoped_refptr<ScopedRefPtrCountBase> p2(p1.Pass());
 | 
| +      EXPECT_EQ(1, ScopedRefPtrCountBase::constructor_count());
 | 
| +      EXPECT_EQ(0, ScopedRefPtrCountBase::destructor_count());
 | 
| +      EXPECT_EQ(nullptr, p1.get());
 | 
| +      EXPECT_EQ(raw, p2.get());
 | 
| +
 | 
| +      // p2 goes out of scope.
 | 
| +    }
 | 
| +    EXPECT_EQ(1, ScopedRefPtrCountBase::constructor_count());
 | 
| +    EXPECT_EQ(1, ScopedRefPtrCountBase::destructor_count());
 | 
| +
 | 
| +    // p1 goes out of scope.
 | 
| +  }
 | 
| +  EXPECT_EQ(1, ScopedRefPtrCountBase::constructor_count());
 | 
| +  EXPECT_EQ(1, ScopedRefPtrCountBase::destructor_count());
 | 
| +}
 | 
| +
 | 
| +TEST(RefCountedUnitTest, MoveConstructorDerived) {
 | 
| +  ScopedRefPtrCountBase::reset_count();
 | 
| +  ScopedRefPtrCountDerived::reset_count();
 | 
| +
 | 
| +  {
 | 
| +    ScopedRefPtrCountDerived *raw1 = new ScopedRefPtrCountDerived();
 | 
| +    scoped_refptr<ScopedRefPtrCountDerived> p1(raw1);
 | 
| +    EXPECT_EQ(1, ScopedRefPtrCountBase::constructor_count());
 | 
| +    EXPECT_EQ(0, ScopedRefPtrCountBase::destructor_count());
 | 
| +    EXPECT_EQ(1, ScopedRefPtrCountDerived::constructor_count());
 | 
| +    EXPECT_EQ(0, ScopedRefPtrCountDerived::destructor_count());
 | 
| +
 | 
| +    {
 | 
| +      scoped_refptr<ScopedRefPtrCountBase> p2(p1.Pass());
 | 
| +      EXPECT_EQ(1, ScopedRefPtrCountBase::constructor_count());
 | 
| +      EXPECT_EQ(0, ScopedRefPtrCountBase::destructor_count());
 | 
| +      EXPECT_EQ(1, ScopedRefPtrCountDerived::constructor_count());
 | 
| +      EXPECT_EQ(0, ScopedRefPtrCountDerived::destructor_count());
 | 
| +      EXPECT_EQ(nullptr, p1.get());
 | 
| +      EXPECT_EQ(raw1, p2.get());
 | 
| +
 | 
| +      // p2 goes out of scope.
 | 
| +    }
 | 
| +    EXPECT_EQ(1, ScopedRefPtrCountBase::constructor_count());
 | 
| +    EXPECT_EQ(1, ScopedRefPtrCountBase::destructor_count());
 | 
| +    EXPECT_EQ(1, ScopedRefPtrCountDerived::constructor_count());
 | 
| +    EXPECT_EQ(1, ScopedRefPtrCountDerived::destructor_count());
 | 
| +
 | 
| +    // p1 goes out of scope.
 | 
| +  }
 | 
| +  EXPECT_EQ(1, ScopedRefPtrCountBase::constructor_count());
 | 
| +  EXPECT_EQ(1, ScopedRefPtrCountBase::destructor_count());
 | 
| +  EXPECT_EQ(1, ScopedRefPtrCountDerived::constructor_count());
 | 
| +  EXPECT_EQ(1, ScopedRefPtrCountDerived::destructor_count());
 | 
| +}
 | 
| +
 | 
| 
 |