Index: base/message_loop/message_loop_test.cc |
diff --git a/base/message_loop/message_loop_test.cc b/base/message_loop/message_loop_test.cc |
index ac50d648481bb7d9e126e052d9f95c7a0ca38e6e..c0e6481c4209b785a9bfee60800b63b5f73080d1 100644 |
--- a/base/message_loop/message_loop_test.cc |
+++ b/base/message_loop/message_loop_test.cc |
@@ -91,7 +91,7 @@ void RecordRunTimeFunc(Time* run_time, int* quit_counter) { |
} // namespace |
void RunTest_PostTask(MessagePumpFactory factory) { |
- scoped_ptr<MessagePump> pump(factory()); |
+ std::unique_ptr<MessagePump> pump(factory()); |
MessageLoop loop(std::move(pump)); |
// Add tests to message loop |
scoped_refptr<Foo> foo(new Foo()); |
@@ -121,7 +121,7 @@ void RunTest_PostTask(MessagePumpFactory factory) { |
} |
void RunTest_PostDelayedTask_Basic(MessagePumpFactory factory) { |
- scoped_ptr<MessagePump> pump(factory()); |
+ std::unique_ptr<MessagePump> pump(factory()); |
MessageLoop loop(std::move(pump)); |
// Test that PostDelayedTask results in a delayed task. |
@@ -144,7 +144,7 @@ void RunTest_PostDelayedTask_Basic(MessagePumpFactory factory) { |
} |
void RunTest_PostDelayedTask_InDelayOrder(MessagePumpFactory factory) { |
- scoped_ptr<MessagePump> pump(factory()); |
+ std::unique_ptr<MessagePump> pump(factory()); |
MessageLoop loop(std::move(pump)); |
// Test that two tasks with different delays run in the right order. |
@@ -169,7 +169,7 @@ void RunTest_PostDelayedTask_InDelayOrder(MessagePumpFactory factory) { |
} |
void RunTest_PostDelayedTask_InPostOrder(MessagePumpFactory factory) { |
- scoped_ptr<MessagePump> pump(factory()); |
+ std::unique_ptr<MessagePump> pump(factory()); |
MessageLoop loop(std::move(pump)); |
// Test that two tasks with the same delay run in the order in which they |
@@ -199,7 +199,7 @@ void RunTest_PostDelayedTask_InPostOrder(MessagePumpFactory factory) { |
} |
void RunTest_PostDelayedTask_InPostOrder_2(MessagePumpFactory factory) { |
- scoped_ptr<MessagePump> pump(factory()); |
+ std::unique_ptr<MessagePump> pump(factory()); |
MessageLoop loop(std::move(pump)); |
// Test that a delayed task still runs after a normal tasks even if the |
@@ -226,7 +226,7 @@ void RunTest_PostDelayedTask_InPostOrder_2(MessagePumpFactory factory) { |
} |
void RunTest_PostDelayedTask_InPostOrder_3(MessagePumpFactory factory) { |
- scoped_ptr<MessagePump> pump(factory()); |
+ std::unique_ptr<MessagePump> pump(factory()); |
MessageLoop loop(std::move(pump)); |
// Test that a delayed task still runs after a pile of normal tasks. The key |
@@ -254,7 +254,7 @@ void RunTest_PostDelayedTask_InPostOrder_3(MessagePumpFactory factory) { |
} |
void RunTest_PostDelayedTask_SharedTimer(MessagePumpFactory factory) { |
- scoped_ptr<MessagePump> pump(factory()); |
+ std::unique_ptr<MessagePump> pump(factory()); |
MessageLoop loop(std::move(pump)); |
// Test that the interval of the timer, used to run the next delayed task, is |
@@ -321,7 +321,7 @@ void RunTest_EnsureDeletion(MessagePumpFactory factory) { |
bool a_was_deleted = false; |
bool b_was_deleted = false; |
{ |
- scoped_ptr<MessagePump> pump(factory()); |
+ std::unique_ptr<MessagePump> pump(factory()); |
MessageLoop loop(std::move(pump)); |
loop.PostTask( |
FROM_HERE, Bind(&RecordDeletionProbe::Run, |
@@ -341,7 +341,7 @@ void RunTest_EnsureDeletion_Chain(MessagePumpFactory factory) { |
bool b_was_deleted = false; |
bool c_was_deleted = false; |
{ |
- scoped_ptr<MessagePump> pump(factory()); |
+ std::unique_ptr<MessagePump> pump(factory()); |
MessageLoop loop(std::move(pump)); |
// The scoped_refptr for each of the below is held either by the chained |
// RecordDeletionProbe, or the bound RecordDeletionProbe::Run() callback. |
@@ -368,7 +368,7 @@ void NestingFunc(int* depth) { |
} |
void RunTest_Nesting(MessagePumpFactory factory) { |
- scoped_ptr<MessagePump> pump(factory()); |
+ std::unique_ptr<MessagePump> pump(factory()); |
MessageLoop loop(std::move(pump)); |
int depth = 100; |
@@ -476,7 +476,7 @@ void QuitFunc(TaskList* order, int cookie) { |
order->RecordEnd(QUITMESSAGELOOP, cookie); |
} |
void RunTest_RecursiveDenial1(MessagePumpFactory factory) { |
- scoped_ptr<MessagePump> pump(factory()); |
+ std::unique_ptr<MessagePump> pump(factory()); |
MessageLoop loop(std::move(pump)); |
EXPECT_TRUE(MessageLoop::current()->NestableTasksAllowed()); |
@@ -523,7 +523,7 @@ void OrderedFunc(TaskList* order, int cookie) { |
} |
void RunTest_RecursiveDenial3(MessagePumpFactory factory) { |
- scoped_ptr<MessagePump> pump(factory()); |
+ std::unique_ptr<MessagePump> pump(factory()); |
MessageLoop loop(std::move(pump)); |
EXPECT_TRUE(MessageLoop::current()->NestableTasksAllowed()); |
@@ -564,7 +564,7 @@ void RunTest_RecursiveDenial3(MessagePumpFactory factory) { |
} |
void RunTest_RecursiveSupport1(MessagePumpFactory factory) { |
- scoped_ptr<MessagePump> pump(factory()); |
+ std::unique_ptr<MessagePump> pump(factory()); |
MessageLoop loop(std::move(pump)); |
TaskList order; |
@@ -597,7 +597,7 @@ void RunTest_RecursiveSupport1(MessagePumpFactory factory) { |
// Tests that non nestable tasks run in FIFO if there are no nested loops. |
void RunTest_NonNestableWithNoNesting(MessagePumpFactory factory) { |
- scoped_ptr<MessagePump> pump(factory()); |
+ std::unique_ptr<MessagePump> pump(factory()); |
MessageLoop loop(std::move(pump)); |
TaskList order; |
@@ -639,7 +639,7 @@ void SleepFunc(TaskList* order, int cookie, TimeDelta delay) { |
// Tests that non nestable tasks don't run when there's code in the call stack. |
void RunTest_NonNestableInNestedLoop(MessagePumpFactory factory, |
bool use_delayed) { |
- scoped_ptr<MessagePump> pump(factory()); |
+ std::unique_ptr<MessagePump> pump(factory()); |
MessageLoop loop(std::move(pump)); |
TaskList order; |
@@ -707,7 +707,7 @@ void FuncThatQuitsNow() { |
} |
// Tests RunLoopQuit only quits the corresponding MessageLoop::Run. |
void RunTest_QuitNow(MessagePumpFactory factory) { |
- scoped_ptr<MessagePump> pump(factory()); |
+ std::unique_ptr<MessagePump> pump(factory()); |
MessageLoop loop(std::move(pump)); |
TaskList order; |
@@ -742,7 +742,7 @@ void RunTest_QuitNow(MessagePumpFactory factory) { |
// Tests RunLoopQuit only quits the corresponding MessageLoop::Run. |
void RunTest_RunLoopQuitTop(MessagePumpFactory factory) { |
- scoped_ptr<MessagePump> pump(factory()); |
+ std::unique_ptr<MessagePump> pump(factory()); |
MessageLoop loop(std::move(pump)); |
TaskList order; |
@@ -772,7 +772,7 @@ void RunTest_RunLoopQuitTop(MessagePumpFactory factory) { |
// Tests RunLoopQuit only quits the corresponding MessageLoop::Run. |
void RunTest_RunLoopQuitNested(MessagePumpFactory factory) { |
- scoped_ptr<MessagePump> pump(factory()); |
+ std::unique_ptr<MessagePump> pump(factory()); |
MessageLoop loop(std::move(pump)); |
TaskList order; |
@@ -802,7 +802,7 @@ void RunTest_RunLoopQuitNested(MessagePumpFactory factory) { |
// Tests RunLoopQuit only quits the corresponding MessageLoop::Run. |
void RunTest_RunLoopQuitBogus(MessagePumpFactory factory) { |
- scoped_ptr<MessagePump> pump(factory()); |
+ std::unique_ptr<MessagePump> pump(factory()); |
MessageLoop loop(std::move(pump)); |
TaskList order; |
@@ -835,7 +835,7 @@ void RunTest_RunLoopQuitBogus(MessagePumpFactory factory) { |
// Tests RunLoopQuit only quits the corresponding MessageLoop::Run. |
void RunTest_RunLoopQuitDeep(MessagePumpFactory factory) { |
- scoped_ptr<MessagePump> pump(factory()); |
+ std::unique_ptr<MessagePump> pump(factory()); |
MessageLoop loop(std::move(pump)); |
TaskList order; |
@@ -904,7 +904,7 @@ void RunTest_RunLoopQuitDeep(MessagePumpFactory factory) { |
// Tests RunLoopQuit works before RunWithID. |
void RunTest_RunLoopQuitOrderBefore(MessagePumpFactory factory) { |
- scoped_ptr<MessagePump> pump(factory()); |
+ std::unique_ptr<MessagePump> pump(factory()); |
MessageLoop loop(std::move(pump)); |
TaskList order; |
@@ -925,7 +925,7 @@ void RunTest_RunLoopQuitOrderBefore(MessagePumpFactory factory) { |
// Tests RunLoopQuit works during RunWithID. |
void RunTest_RunLoopQuitOrderDuring(MessagePumpFactory factory) { |
- scoped_ptr<MessagePump> pump(factory()); |
+ std::unique_ptr<MessagePump> pump(factory()); |
MessageLoop loop(std::move(pump)); |
TaskList order; |
@@ -952,7 +952,7 @@ void RunTest_RunLoopQuitOrderDuring(MessagePumpFactory factory) { |
// Tests RunLoopQuit works after RunWithID. |
void RunTest_RunLoopQuitOrderAfter(MessagePumpFactory factory) { |
- scoped_ptr<MessagePump> pump(factory()); |
+ std::unique_ptr<MessagePump> pump(factory()); |
MessageLoop loop(std::move(pump)); |
TaskList order; |
@@ -1010,7 +1010,7 @@ void PostNTasksThenQuit(int posts_remaining) { |
// times to reproduce the bug. |
void RunTest_RecursivePosts(MessagePumpFactory factory) { |
const int kNumTimes = 1 << 17; |
- scoped_ptr<MessagePump> pump(factory()); |
+ std::unique_ptr<MessagePump> pump(factory()); |
MessageLoop loop(std::move(pump)); |
loop.PostTask(FROM_HERE, Bind(&PostNTasksThenQuit, kNumTimes)); |
loop.Run(); |