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

base/scoped_generic_unittest.cc

 // Copyright 2014 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/scoped_generic.h"
+
+#include <utility>
 #include <vector>
 
-#include "base/scoped_generic.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
 
 namespace {
 
 struct IntTraits {
   IntTraits(std::vector<int>* freed) : freed_ints(freed) {}
 
   static int InvalidValue() {
@@ skipping 60 matching lines @@
     EXPECT_TRUE(values_freed.empty());  // Nothing should be freed.
     EXPECT_EQ(kSecond, a.get());
     EXPECT_EQ(kFirst, b.get());
   }
   // Values should be deleted in the opposite order.
   ASSERT_EQ(2u, values_freed.size());
   EXPECT_EQ(kFirst, values_freed[0]);
   EXPECT_EQ(kSecond, values_freed[1]);
   values_freed.clear();
 
-  // Pass constructor.
+  // Move constructor.
   {
     ScopedInt a(kFirst, traits);
-    ScopedInt b(a.Pass());
+    ScopedInt b(std::move(a));
     EXPECT_TRUE(values_freed.empty());  // Nothing should be freed.
     ASSERT_EQ(IntTraits::InvalidValue(), a.get());
     ASSERT_EQ(kFirst, b.get());
   }
 
   ASSERT_EQ(1u, values_freed.size());
   ASSERT_EQ(kFirst, values_freed[0]);
   values_freed.clear();
 
-  // Pass assign.
+  // Move assign.
   {
     ScopedInt a(kFirst, traits);
     ScopedInt b(kSecond, traits);
-    b = a.Pass();
+    b = std::move(a);
     ASSERT_EQ(1u, values_freed.size());
     EXPECT_EQ(kSecond, values_freed[0]);
     ASSERT_EQ(IntTraits::InvalidValue(), a.get());
     ASSERT_EQ(kFirst, b.get());
   }
 
   ASSERT_EQ(2u, values_freed.size());
   EXPECT_EQ(kFirst, values_freed[1]);
   values_freed.clear();
 }
@@ skipping 45 matching lines @@
 
   // Implicit conversion to bool shouldn't work.
   /*{
     ScopedInt a(kFirst, traits);
     bool result = a;
   }*/
 }
 #endif
 
 }  // namespace base