Index: sync/internal_api/attachments/task_queue_unittest.cc |
diff --git a/sync/internal_api/attachments/task_queue_unittest.cc b/sync/internal_api/attachments/task_queue_unittest.cc |
index 361d49c6dced7d08066875cdd92a1f566f2c920c..688412a34140299b3c39d03d5671b6d7d2766bdd 100644 |
--- a/sync/internal_api/attachments/task_queue_unittest.cc |
+++ b/sync/internal_api/attachments/task_queue_unittest.cc |
@@ -2,8 +2,7 @@ |
// 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" |
@@ -11,6 +10,7 @@ |
#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; |
@@ -100,7 +100,7 @@ TEST_F(TaskQueueTest, AddToQueue_NoDuplicates) { |
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); |
@@ -198,7 +198,7 @@ TEST_F(TaskQueueTest, Cancel) { |
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. |