Transfer the C++03 move-only type emulation into base/move.h and also make ScopedVector move-only.

base/memory/scoped_vector_unittest.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/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
@@ skipping 108 matching lines @@
   LifeCycleWatcher watcher;
   EXPECT_EQ(LC_INITIAL, watcher.life_cycle_state());
   {
     ScopedVector<LifeCycleObject> scoped_vector;
     scoped_vector.push_back(watcher.NewLifeCycleObject());
     EXPECT_EQ(LC_CONSTRUCTED, watcher.life_cycle_state());
   }
   EXPECT_EQ(LC_DESTROYED, watcher.life_cycle_state());
 }
 
+TEST(ScopedVectorTest, MoveConstruct) {
+  LifeCycleWatcher watcher;
+  EXPECT_EQ(LC_INITIAL, watcher.life_cycle_state());
+  {
+    ScopedVector<LifeCycleObject> scoped_vector;
+    scoped_vector.push_back(watcher.NewLifeCycleObject());
+    EXPECT_FALSE(scoped_vector.empty());
+
+    ScopedVector<LifeCycleObject> scoped_vector_copy(scoped_vector.Pass());
+    EXPECT_TRUE(scoped_vector.empty());
+    EXPECT_FALSE(scoped_vector_copy.empty());
+
+    EXPECT_EQ(LC_CONSTRUCTED, watcher.life_cycle_state());
+  }
+  EXPECT_EQ(LC_DESTROYED, watcher.life_cycle_state());
+}
+
+TEST(ScopedVectorTest, MoveAssign) {
+  LifeCycleWatcher watcher;
+  EXPECT_EQ(LC_INITIAL, watcher.life_cycle_state());
+  {
+    ScopedVector<LifeCycleObject> scoped_vector;
+    scoped_vector.push_back(watcher.NewLifeCycleObject());
+    ScopedVector<LifeCycleObject> scoped_vector_assign;
+    EXPECT_FALSE(scoped_vector.empty());
+
+    scoped_vector_assign = scoped_vector.Pass();
+    EXPECT_TRUE(scoped_vector.empty());
+    EXPECT_FALSE(scoped_vector_assign.empty());
+
+    EXPECT_EQ(LC_CONSTRUCTED, watcher.life_cycle_state());
+  }
+  EXPECT_EQ(LC_DESTROYED, watcher.life_cycle_state());
+}
+
 TEST(ScopedVectorTest, InsertRange) {
   LifeCycleWatcher watchers[5];
 
   std::vector<LifeCycleObject*> vec;
   for(LifeCycleWatcher* it = watchers; it != watchers + arraysize(watchers);
       ++it) {
     EXPECT_EQ(LC_INITIAL, it->life_cycle_state());
     vec.push_back(it->NewLifeCycleObject());
     EXPECT_EQ(LC_CONSTRUCTED, it->life_cycle_state());
   }
   // Start scope for ScopedVector.
   {
     ScopedVector<LifeCycleObject> scoped_vector;
     scoped_vector.insert(scoped_vector.end(), vec.begin() + 1, vec.begin() + 3);
     for(LifeCycleWatcher* it = watchers; it != watchers + arraysize(watchers);
         ++it)
       EXPECT_EQ(LC_CONSTRUCTED, it->life_cycle_state());
   }
   for(LifeCycleWatcher* it = watchers; it != watchers + 1; ++it)
     EXPECT_EQ(LC_CONSTRUCTED, it->life_cycle_state());
   for(LifeCycleWatcher* it = watchers + 1; it != watchers + 3; ++it)
     EXPECT_EQ(LC_DESTROYED, it->life_cycle_state());
   for(LifeCycleWatcher* it = watchers + 3; it != watchers + arraysize(watchers);
       ++it)
     EXPECT_EQ(LC_CONSTRUCTED, it->life_cycle_state());
 }
 
 }  // namespace