Index: base/message_loop/message_loop_task_runner_unittest.cc |
diff --git a/base/message_loop/message_loop_task_runner_unittest.cc b/base/message_loop/message_loop_task_runner_unittest.cc |
index a0d84b7edb38bd2bfa6bf3417ee70015a0bee0c5..51dfd117fdb477f6facfc4d55a7eb795905332b6 100644 |
--- a/base/message_loop/message_loop_task_runner_unittest.cc |
+++ b/base/message_loop/message_loop_task_runner_unittest.cc |
@@ -4,10 +4,11 @@ |
#include "base/message_loop/message_loop_task_runner.h" |
+#include <memory> |
+ |
#include "base/atomic_sequence_num.h" |
#include "base/bind.h" |
#include "base/debug/leak_annotations.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/message_loop/message_loop.h" |
#include "base/message_loop/message_loop_task_runner.h" |
#include "base/synchronization/waitable_event.h" |
@@ -88,7 +89,7 @@ class MessageLoopTaskRunnerTest : public testing::Test { |
static StaticAtomicSequenceNumber g_order; |
- scoped_ptr<MessageLoop> current_loop_; |
+ std::unique_ptr<MessageLoop> current_loop_; |
Thread task_thread_; |
private: |
@@ -303,8 +304,8 @@ class MessageLoopTaskRunnerThreadingTest : public testing::Test { |
MessageLoopTaskRunnerThreadingTest* test_; |
}; |
- scoped_ptr<Thread> io_thread_; |
- scoped_ptr<Thread> file_thread_; |
+ std::unique_ptr<Thread> io_thread_; |
+ std::unique_ptr<Thread> file_thread_; |
private: |
mutable MessageLoop loop_; |
@@ -330,7 +331,7 @@ TEST_F(MessageLoopTaskRunnerThreadingTest, PostTask) { |
} |
TEST_F(MessageLoopTaskRunnerThreadingTest, PostTaskAfterThreadExits) { |
- scoped_ptr<Thread> test_thread( |
+ std::unique_ptr<Thread> test_thread( |
new Thread("MessageLoopTaskRunnerThreadingTest_Dummy")); |
test_thread->Start(); |
scoped_refptr<SingleThreadTaskRunner> task_runner = |
@@ -345,7 +346,7 @@ TEST_F(MessageLoopTaskRunnerThreadingTest, PostTaskAfterThreadExits) { |
TEST_F(MessageLoopTaskRunnerThreadingTest, PostTaskAfterThreadIsDeleted) { |
scoped_refptr<SingleThreadTaskRunner> task_runner; |
{ |
- scoped_ptr<Thread> test_thread( |
+ std::unique_ptr<Thread> test_thread( |
new Thread("MessageLoopTaskRunnerThreadingTest_Dummy")); |
test_thread->Start(); |
task_runner = test_thread->task_runner(); |