Index: webrtc/system_wrappers/source/scoped_vector_unittest.cc |
diff --git a/webrtc/system_wrappers/source/scoped_vector_unittest.cc b/webrtc/system_wrappers/source/scoped_vector_unittest.cc |
index 6e38f01f0b0aa6229fa4e24f76e6e8927cf855bd..d0275947dde5258485a82960d860aec535c37523 100644 |
--- a/webrtc/system_wrappers/source/scoped_vector_unittest.cc |
+++ b/webrtc/system_wrappers/source/scoped_vector_unittest.cc |
@@ -221,8 +221,7 @@ TEST(ScopedVectorTest, MoveConstruct) { |
EXPECT_FALSE(scoped_vector.empty()); |
EXPECT_TRUE(watcher.IsWatching(scoped_vector.back())); |
- ScopedVector<LifeCycleObject> scoped_vector_copy( |
- scoped_vector.DEPRECATED_Pass()); |
+ ScopedVector<LifeCycleObject> scoped_vector_copy(std::move(scoped_vector)); |
EXPECT_TRUE(scoped_vector.empty()); |
EXPECT_FALSE(scoped_vector_copy.empty()); |
EXPECT_TRUE(watcher.IsWatching(scoped_vector_copy.back())); |
@@ -242,7 +241,7 @@ TEST(ScopedVectorTest, MoveAssign) { |
EXPECT_FALSE(scoped_vector.empty()); |
EXPECT_TRUE(watcher.IsWatching(scoped_vector.back())); |
- scoped_vector_assign = scoped_vector.DEPRECATED_Pass(); |
+ scoped_vector_assign = std::move(scoped_vector); |
EXPECT_TRUE(scoped_vector.empty()); |
EXPECT_FALSE(scoped_vector_assign.empty()); |
EXPECT_TRUE(watcher.IsWatching(scoped_vector_assign.back())); |
@@ -274,12 +273,8 @@ class DeleteCounter { |
template <typename T> |
class PassThru { |
public: |
- explicit PassThru(ScopedVector<T> scoper) |
- : scoper_(scoper.DEPRECATED_Pass()) {} |
- |
- ScopedVector<T> Run() { |
- return scoper_.DEPRECATED_Pass(); |
- } |
+ explicit PassThru(ScopedVector<T> scoper) : scoper_(std::move(scoper)) {} |
+ ScopedVector<T> Run() { return std::move(scoper_); } |
private: |
ScopedVector<T> scoper_; |
@@ -290,7 +285,7 @@ TEST(ScopedVectorTest, Passed) { |
ScopedVector<DeleteCounter> deleter_vector; |
deleter_vector.push_back(new DeleteCounter(&deletes)); |
EXPECT_EQ(0, deletes); |
- PassThru<DeleteCounter> pass_thru(deleter_vector.DEPRECATED_Pass()); |
+ PassThru<DeleteCounter> pass_thru(std::move(deleter_vector)); |
EXPECT_EQ(0, deletes); |
ScopedVector<DeleteCounter> result = pass_thru.Run(); |
EXPECT_EQ(0, deletes); |