base: Use std::move() instead of Pass() for real movable types.

base/memory/ref_counted_unittest.cc

 // Copyright (c) 2012 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/ref_counted.h"
 
 #include "base/test/opaque_ref_counted.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
@@ skipping 162 matching lines @@
 
   EXPECT_NE(p1, p2);
   EXPECT_NE(p2, p1);
 
   p2 = p1;
 
   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();
+      p2 = std::move(p1);
       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());
 
@@ skipping 10 matching lines @@
     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();
+      p1 = std::move(p2);
       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());
 
@@ skipping 10 matching lines @@
     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();
+      p1 = std::move(p2);
       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());
 
@@ skipping 10 matching lines @@
     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();
+      p2 = std::move(p1);
       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());
 
@@ skipping 11 matching lines @@
     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();
+      p1 = std::move(p2);
       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());
 
@@ skipping 16 matching lines @@
     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();
+      p1 = std::move(p2);
       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());
@@ skipping 12 matching lines @@
 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());
+      scoped_refptr<ScopedRefPtrCountBase> p2(std::move(p1));
       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());
+      scoped_refptr<ScopedRefPtrCountBase> p2(std::move(p1));
       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());
 }