Convert Pass()→std::move() in sync/

sync/internal_api/attachments/task_queue_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 "sync/internal_api/public/attachments/task_queue.h"
-
+#include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/timer/mock_timer.h"
+#include "sync/internal_api/public/attachments/task_queue.h"

[Nicolas Zea, 2015/12/18 23:46:55]

keep up top

 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::TimeDelta;
 
 namespace syncer {
 
 namespace {
 
 const TimeDelta kZero;
 
@@ skipping 69 matching lines @@
   queue_->MarkAsSucceeded(2);
   RunLoop();
 
   ASSERT_TRUE(dispatched_.empty());
 }
 
 // See that Retry works as expected.
 TEST_F(TaskQueueTest, Retry) {
   scoped_ptr<base::MockTimer> timer_to_pass(new base::MockTimer(false, false));
   base::MockTimer* mock_timer = timer_to_pass.get();
-  queue_->SetTimerForTest(timer_to_pass.Pass());
+  queue_->SetTimerForTest(std::move(timer_to_pass));
 
   // 1st attempt.
   queue_->AddToQueue(1);
   ASSERT_TRUE(mock_timer->IsRunning());
   ASSERT_EQ(kZero, mock_timer->GetCurrentDelay());
   TimeDelta last_delay = mock_timer->GetCurrentDelay();
   mock_timer->Fire();
   RunLoop();
 
   // 2nd attempt.
@@ skipping 77 matching lines @@
   queue_->Cancel(1);
   RunLoop();
 
   ASSERT_TRUE(dispatched_.empty());
 }
 
 // See that ResetBackoff resets the backoff delay.
 TEST_F(TaskQueueTest, ResetBackoff) {
   scoped_ptr<base::MockTimer> timer_to_pass(new base::MockTimer(false, false));
   base::MockTimer* mock_timer = timer_to_pass.get();
-  queue_->SetTimerForTest(timer_to_pass.Pass());
+  queue_->SetTimerForTest(std::move(timer_to_pass));
 
   // Add an item, mark it as failed, re-add it and see that we now have a
   // backoff delay.
   queue_->AddToQueue(1);
   ASSERT_TRUE(mock_timer->IsRunning());
   ASSERT_EQ(kZero, mock_timer->GetCurrentDelay());
   mock_timer->Fire();
   RunLoop();
   ASSERT_FALSE(mock_timer->IsRunning());
   ASSERT_EQ(1U, dispatched_.size());
@@ skipping 12 matching lines @@
   mock_timer->Fire();
   RunLoop();
   ASSERT_FALSE(mock_timer->IsRunning());
   ASSERT_EQ(1U, dispatched_.size());
   EXPECT_EQ(1, dispatched_.front());
   dispatched_.clear();
   queue_->MarkAsSucceeded(1);
 }
 
 }  // namespace syncer