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

base/sequence_checker_unittest.cc

 // Copyright 2013 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/sequence_checker.h"

[Lei Zhang, 2015/11/25 00:55:04]

I remember the rule being: for unit tests, they stay in the list below, like
with any other user of the code.

But then I checked the style guide and it agrees with your change. Do you know
if the style guide changed or I'm just mis-remembering?

[danakj, 2015/11/25 01:01:45]

I don't remember it being any other way since I started, so dunno!

+
+#include <utility>
+
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/sequence_checker.h"
 #include "base/single_thread_task_runner.h"
 #include "base/test/sequenced_worker_pool_owner.h"
 #include "base/threading/thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // Duplicated from base/sequence_checker.h so that we can be good citizens
 // there and undef the macro.
 #if (!defined(NDEBUG) || defined(DCHECK_ALWAYS_ON))
 #define ENABLE_SEQUENCE_CHECKER 1
 #else
@@ skipping 100 matching lines @@
 
   // Verify that the destructor doesn't assert.
   sequence_checked_object.reset();
 }
 
 TEST_F(SequenceCheckerTest, DestructorAllowedOnDifferentThread) {
   scoped_ptr<SequenceCheckedObject> sequence_checked_object(
       new SequenceCheckedObject);
 
   // Verify the destructor doesn't assert when called on a different thread.
-  PostDeleteToOtherThread(sequence_checked_object.Pass());
+  PostDeleteToOtherThread(std::move(sequence_checked_object));
   other_thread()->Stop();
 }
 
 TEST_F(SequenceCheckerTest, DetachFromSequence) {
   scoped_ptr<SequenceCheckedObject> sequence_checked_object(
       new SequenceCheckedObject);
 
   // Verify that DoStuff doesn't assert when called on a different thread after
   // a call to DetachFromSequence.
   sequence_checked_object->DetachFromSequence();
 
   PostDoStuffToOtherThread(sequence_checked_object.get());
   other_thread()->Stop();
 }
 
 TEST_F(SequenceCheckerTest, SameSequenceTokenValid) {
   scoped_ptr<SequenceCheckedObject> sequence_checked_object(
       new SequenceCheckedObject);
 
   sequence_checked_object->DetachFromSequence();
   PostDoStuffToWorkerPool(sequence_checked_object.get(), "A");
   PostDoStuffToWorkerPool(sequence_checked_object.get(), "A");
   PostDoStuffToWorkerPool(sequence_checked_object.get(), "A");
   PostDoStuffToWorkerPool(sequence_checked_object.get(), "A");
   pool()->FlushForTesting();
 
-  PostDeleteToOtherThread(sequence_checked_object.Pass());
+  PostDeleteToOtherThread(std::move(sequence_checked_object));
   other_thread()->Stop();
 }
 
 TEST_F(SequenceCheckerTest, DetachSequenceTokenValid) {
   scoped_ptr<SequenceCheckedObject> sequence_checked_object(
       new SequenceCheckedObject);
 
   sequence_checked_object->DetachFromSequence();
   PostDoStuffToWorkerPool(sequence_checked_object.get(), "A");
   PostDoStuffToWorkerPool(sequence_checked_object.get(), "A");
   pool()->FlushForTesting();
 
   sequence_checked_object->DetachFromSequence();
   PostDoStuffToWorkerPool(sequence_checked_object.get(), "B");
   PostDoStuffToWorkerPool(sequence_checked_object.get(), "B");
   pool()->FlushForTesting();
 
-  PostDeleteToOtherThread(sequence_checked_object.Pass());
+  PostDeleteToOtherThread(std::move(sequence_checked_object));
   other_thread()->Stop();
 }
 
 #if GTEST_HAS_DEATH_TEST || !ENABLE_SEQUENCE_CHECKER
 
 void SequenceCheckerTest::MethodOnDifferentThreadDeathTest() {
   scoped_ptr<SequenceCheckedObject> sequence_checked_object(
       new SequenceCheckedObject);
 
   // DoStuff should assert in debug builds only when called on a
@@ skipping 49 matching lines @@
   scoped_ptr<SequenceCheckedObject> sequence_checked_object(
       new SequenceCheckedObject);
 
   sequence_checked_object->DetachFromSequence();
   PostDoStuffToWorkerPool(sequence_checked_object.get(), "A");
   PostDoStuffToWorkerPool(sequence_checked_object.get(), "A");
   PostDoStuffToWorkerPool(sequence_checked_object.get(), "B");
   PostDoStuffToWorkerPool(sequence_checked_object.get(), "B");
   pool()->FlushForTesting();
 
-  PostDeleteToOtherThread(sequence_checked_object.Pass());
+  PostDeleteToOtherThread(std::move(sequence_checked_object));
   other_thread()->Stop();
 }
 
 #if ENABLE_SEQUENCE_CHECKER
 TEST_F(SequenceCheckerTest, DifferentSequenceTokensDeathTestInDebug) {
   // The default style "fast" does not support multi-threaded tests.
   ::testing::FLAGS_gtest_death_test_style = "threadsafe";
   ASSERT_DEATH({
     DifferentSequenceTokensDeathTest();
   }, "");
@@ skipping 65 matching lines @@
 #endif  // ENABLE_SEQUENCE_CHECKER
 
 #endif  // GTEST_HAS_DEATH_TEST || !ENABLE_SEQUENCE_CHECKER
 
 }  // namespace
 
 }  // namespace base
 
 // Just in case we ever get lumped together with other compilation units.
 #undef ENABLE_SEQUENCE_CHECKER