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 6ffb16d05aedf530b6682472486413cd7c92b850..ad9f127390e8edbd17f3548da6626a974c13cf2c 100644 |
--- a/base/message_loop/message_loop_test.cc |
+++ b/base/message_loop/message_loop_test.cc |
@@ -98,21 +98,22 @@ void RunTest_PostTask(MessagePumpFactory factory) { |
// Add tests to message loop |
scoped_refptr<Foo> foo(new Foo()); |
std::string a("a"), b("b"), c("c"), d("d"); |
- ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, Bind(&Foo::Test0, foo)); |
ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, |
- Bind(&Foo::Test1ConstRef, foo, a)); |
- ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, |
- Bind(&Foo::Test1Ptr, foo, &b)); |
- ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, |
- Bind(&Foo::Test1Int, foo, 100)); |
+ BindOnce(&Foo::Test0, foo)); |
+ ThreadTaskRunnerHandle::Get()->PostTask( |
+ FROM_HERE, BindOnce(&Foo::Test1ConstRef, foo, a)); |
ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, |
- Bind(&Foo::Test2Ptr, foo, &a, &c)); |
+ BindOnce(&Foo::Test1Ptr, foo, &b)); |
ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, |
- Bind(&Foo::Test2Mixed, foo, a, &d)); |
+ BindOnce(&Foo::Test1Int, foo, 100)); |
+ ThreadTaskRunnerHandle::Get()->PostTask( |
+ FROM_HERE, BindOnce(&Foo::Test2Ptr, foo, &a, &c)); |
+ ThreadTaskRunnerHandle::Get()->PostTask( |
+ FROM_HERE, BindOnce(&Foo::Test2Mixed, foo, a, &d)); |
// After all tests, post a message that will shut down the message loop |
ThreadTaskRunnerHandle::Get()->PostTask( |
FROM_HERE, |
- Bind(&MessageLoop::QuitWhenIdle, Unretained(MessageLoop::current()))); |
+ BindOnce(&MessageLoop::QuitWhenIdle, Unretained(MessageLoop::current()))); |
// Now kick things off |
RunLoop().Run(); |
@@ -133,7 +134,7 @@ void RunTest_PostDelayedTask_Basic(MessagePumpFactory factory) { |
Time run_time; |
loop.task_runner()->PostDelayedTask( |
- FROM_HERE, Bind(&RecordRunTimeFunc, &run_time, &num_tasks), kDelay); |
+ FROM_HERE, BindOnce(&RecordRunTimeFunc, &run_time, &num_tasks), kDelay); |
Time time_before_run = Time::Now(); |
RunLoop().Run(); |
@@ -152,12 +153,12 @@ void RunTest_PostDelayedTask_InDelayOrder(MessagePumpFactory factory) { |
Time run_time1, run_time2; |
loop.task_runner()->PostDelayedTask( |
- FROM_HERE, Bind(&RecordRunTimeFunc, &run_time1, &num_tasks), |
+ FROM_HERE, BindOnce(&RecordRunTimeFunc, &run_time1, &num_tasks), |
TimeDelta::FromMilliseconds(200)); |
// If we get a large pause in execution (due to a context switch) here, this |
// test could fail. |
loop.task_runner()->PostDelayedTask( |
- FROM_HERE, Bind(&RecordRunTimeFunc, &run_time2, &num_tasks), |
+ FROM_HERE, BindOnce(&RecordRunTimeFunc, &run_time2, &num_tasks), |
TimeDelta::FromMilliseconds(10)); |
RunLoop().Run(); |
@@ -184,9 +185,9 @@ void RunTest_PostDelayedTask_InPostOrder(MessagePumpFactory factory) { |
Time run_time1, run_time2; |
loop.task_runner()->PostDelayedTask( |
- FROM_HERE, Bind(&RecordRunTimeFunc, &run_time1, &num_tasks), kDelay); |
+ FROM_HERE, BindOnce(&RecordRunTimeFunc, &run_time1, &num_tasks), kDelay); |
loop.task_runner()->PostDelayedTask( |
- FROM_HERE, Bind(&RecordRunTimeFunc, &run_time2, &num_tasks), kDelay); |
+ FROM_HERE, BindOnce(&RecordRunTimeFunc, &run_time2, &num_tasks), kDelay); |
RunLoop().Run(); |
EXPECT_EQ(0, num_tasks); |
@@ -206,9 +207,10 @@ void RunTest_PostDelayedTask_InPostOrder_2(MessagePumpFactory factory) { |
int num_tasks = 2; |
Time run_time; |
- loop.task_runner()->PostTask(FROM_HERE, Bind(&SlowFunc, kPause, &num_tasks)); |
+ loop.task_runner()->PostTask(FROM_HERE, |
+ BindOnce(&SlowFunc, kPause, &num_tasks)); |
loop.task_runner()->PostDelayedTask( |
- FROM_HERE, Bind(&RecordRunTimeFunc, &run_time, &num_tasks), |
+ FROM_HERE, BindOnce(&RecordRunTimeFunc, &run_time, &num_tasks), |
TimeDelta::FromMilliseconds(10)); |
Time time_before_run = Time::Now(); |
@@ -236,10 +238,10 @@ void RunTest_PostDelayedTask_InPostOrder_3(MessagePumpFactory factory) { |
// Clutter the ML with tasks. |
for (int i = 1; i < num_tasks; ++i) |
loop.task_runner()->PostTask( |
- FROM_HERE, Bind(&RecordRunTimeFunc, &run_time1, &num_tasks)); |
+ FROM_HERE, BindOnce(&RecordRunTimeFunc, &run_time1, &num_tasks)); |
loop.task_runner()->PostDelayedTask( |
- FROM_HERE, Bind(&RecordRunTimeFunc, &run_time2, &num_tasks), |
+ FROM_HERE, BindOnce(&RecordRunTimeFunc, &run_time2, &num_tasks), |
TimeDelta::FromMilliseconds(1)); |
RunLoop().Run(); |
@@ -261,10 +263,10 @@ void RunTest_PostDelayedTask_SharedTimer(MessagePumpFactory factory) { |
Time run_time1, run_time2; |
loop.task_runner()->PostDelayedTask( |
- FROM_HERE, Bind(&RecordRunTimeFunc, &run_time1, &num_tasks), |
+ FROM_HERE, BindOnce(&RecordRunTimeFunc, &run_time1, &num_tasks), |
TimeDelta::FromSeconds(1000)); |
loop.task_runner()->PostDelayedTask( |
- FROM_HERE, Bind(&RecordRunTimeFunc, &run_time2, &num_tasks), |
+ FROM_HERE, BindOnce(&RecordRunTimeFunc, &run_time2, &num_tasks), |
TimeDelta::FromMilliseconds(10)); |
Time start_time = Time::Now(); |
@@ -303,7 +305,7 @@ class RecordDeletionProbe : public RefCounted<RecordDeletionProbe> { |
*was_deleted_ = true; |
if (post_on_delete_.get()) |
ThreadTaskRunnerHandle::Get()->PostTask( |
- FROM_HERE, Bind(&RecordDeletionProbe::Run, post_on_delete_)); |
+ FROM_HERE, BindOnce(&RecordDeletionProbe::Run, post_on_delete_)); |
} |
scoped_refptr<RecordDeletionProbe> post_on_delete_; |
@@ -317,12 +319,13 @@ void RunTest_EnsureDeletion(MessagePumpFactory factory) { |
std::unique_ptr<MessagePump> pump(factory()); |
MessageLoop loop(std::move(pump)); |
loop.task_runner()->PostTask( |
- FROM_HERE, Bind(&RecordDeletionProbe::Run, |
- new RecordDeletionProbe(NULL, &a_was_deleted))); |
+ FROM_HERE, BindOnce(&RecordDeletionProbe::Run, |
+ new RecordDeletionProbe(NULL, &a_was_deleted))); |
// TODO(ajwong): Do we really need 1000ms here? |
loop.task_runner()->PostDelayedTask( |
- FROM_HERE, Bind(&RecordDeletionProbe::Run, |
- new RecordDeletionProbe(NULL, &b_was_deleted)), |
+ FROM_HERE, |
+ BindOnce(&RecordDeletionProbe::Run, |
+ new RecordDeletionProbe(NULL, &b_was_deleted)), |
TimeDelta::FromMilliseconds(1000)); |
} |
EXPECT_TRUE(a_was_deleted); |
@@ -341,7 +344,8 @@ void RunTest_EnsureDeletion_Chain(MessagePumpFactory factory) { |
RecordDeletionProbe* a = new RecordDeletionProbe(NULL, &a_was_deleted); |
RecordDeletionProbe* b = new RecordDeletionProbe(a, &b_was_deleted); |
RecordDeletionProbe* c = new RecordDeletionProbe(b, &c_was_deleted); |
- loop.task_runner()->PostTask(FROM_HERE, Bind(&RecordDeletionProbe::Run, c)); |
+ loop.task_runner()->PostTask(FROM_HERE, |
+ BindOnce(&RecordDeletionProbe::Run, c)); |
} |
EXPECT_TRUE(a_was_deleted); |
EXPECT_TRUE(b_was_deleted); |
@@ -352,7 +356,7 @@ void NestingFunc(int* depth) { |
if (*depth > 0) { |
*depth -= 1; |
ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, |
- Bind(&NestingFunc, depth)); |
+ BindOnce(&NestingFunc, depth)); |
MessageLoop::current()->SetNestableTasksAllowed(true); |
RunLoop().Run(); |
@@ -366,7 +370,7 @@ void RunTest_Nesting(MessagePumpFactory factory) { |
int depth = 100; |
ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, |
- Bind(&NestingFunc, &depth)); |
+ BindOnce(&NestingFunc, &depth)); |
RunLoop().Run(); |
EXPECT_EQ(depth, 0); |
} |
@@ -404,7 +408,7 @@ void RunNestedLoop(TestNestingObserver* observer, |
// Verify that by the time the first task is run the observer has seen the |
// message loop begin. |
ThreadTaskRunnerHandle::Get()->PostTask( |
- FROM_HERE, Bind(&ExpectOneBeginNestedLoop, observer)); |
+ FROM_HERE, BindOnce(&ExpectOneBeginNestedLoop, observer)); |
ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, nested_loop.QuitClosure()); |
nested_loop.Run(); |
@@ -424,9 +428,9 @@ void RunTest_NestingObserver(MessagePumpFactory factory) { |
outer_loop.AddNestingObserver(&nesting_observer); |
// Post a task that runs a nested message loop. |
- outer_loop.task_runner()->PostTask(FROM_HERE, |
- Bind(&RunNestedLoop, &nesting_observer, |
- outer_loop.QuitWhenIdleClosure())); |
+ outer_loop.task_runner()->PostTask( |
+ FROM_HERE, BindOnce(&RunNestedLoop, &nesting_observer, |
+ outer_loop.QuitWhenIdleClosure())); |
RunLoop().Run(); |
outer_loop.RemoveNestingObserver(&nesting_observer); |
@@ -519,7 +523,7 @@ void RecursiveFunc(TaskList* order, int cookie, int depth, |
MessageLoop::current()->SetNestableTasksAllowed(true); |
ThreadTaskRunnerHandle::Get()->PostTask( |
FROM_HERE, |
- Bind(&RecursiveFunc, order, cookie, depth - 1, is_reentrant)); |
+ BindOnce(&RecursiveFunc, order, cookie, depth - 1, is_reentrant)); |
} |
order->RecordEnd(RECURSIVE, cookie); |
} |
@@ -536,11 +540,11 @@ void RunTest_RecursiveDenial1(MessagePumpFactory factory) { |
EXPECT_TRUE(MessageLoop::current()->NestableTasksAllowed()); |
TaskList order; |
ThreadTaskRunnerHandle::Get()->PostTask( |
- FROM_HERE, Bind(&RecursiveFunc, &order, 1, 2, false)); |
+ FROM_HERE, BindOnce(&RecursiveFunc, &order, 1, 2, false)); |
ThreadTaskRunnerHandle::Get()->PostTask( |
- FROM_HERE, Bind(&RecursiveFunc, &order, 2, 2, false)); |
+ FROM_HERE, BindOnce(&RecursiveFunc, &order, 2, 2, false)); |
ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, |
- Bind(&QuitFunc, &order, 3)); |
+ BindOnce(&QuitFunc, &order, 3)); |
RunLoop().Run(); |
@@ -580,13 +584,15 @@ void RunTest_RecursiveDenial3(MessagePumpFactory factory) { |
EXPECT_TRUE(MessageLoop::current()->NestableTasksAllowed()); |
TaskList order; |
ThreadTaskRunnerHandle::Get()->PostTask( |
- FROM_HERE, Bind(&RecursiveSlowFunc, &order, 1, 2, false)); |
+ FROM_HERE, BindOnce(&RecursiveSlowFunc, &order, 1, 2, false)); |
ThreadTaskRunnerHandle::Get()->PostTask( |
- FROM_HERE, Bind(&RecursiveSlowFunc, &order, 2, 2, false)); |
+ FROM_HERE, BindOnce(&RecursiveSlowFunc, &order, 2, 2, false)); |
ThreadTaskRunnerHandle::Get()->PostDelayedTask( |
- FROM_HERE, Bind(&OrderedFunc, &order, 3), TimeDelta::FromMilliseconds(5)); |
+ FROM_HERE, BindOnce(&OrderedFunc, &order, 3), |
+ TimeDelta::FromMilliseconds(5)); |
ThreadTaskRunnerHandle::Get()->PostDelayedTask( |
- FROM_HERE, Bind(&QuitFunc, &order, 4), TimeDelta::FromMilliseconds(5)); |
+ FROM_HERE, BindOnce(&QuitFunc, &order, 4), |
+ TimeDelta::FromMilliseconds(5)); |
RunLoop().Run(); |
@@ -616,11 +622,11 @@ void RunTest_RecursiveSupport1(MessagePumpFactory factory) { |
TaskList order; |
ThreadTaskRunnerHandle::Get()->PostTask( |
- FROM_HERE, Bind(&RecursiveFunc, &order, 1, 2, true)); |
+ FROM_HERE, BindOnce(&RecursiveFunc, &order, 1, 2, true)); |
ThreadTaskRunnerHandle::Get()->PostTask( |
- FROM_HERE, Bind(&RecursiveFunc, &order, 2, 2, true)); |
+ FROM_HERE, BindOnce(&RecursiveFunc, &order, 2, 2, true)); |
ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, |
- Bind(&QuitFunc, &order, 3)); |
+ BindOnce(&QuitFunc, &order, 3)); |
RunLoop().Run(); |
@@ -650,11 +656,11 @@ void RunTest_NonNestableWithNoNesting(MessagePumpFactory factory) { |
TaskList order; |
ThreadTaskRunnerHandle::Get()->PostNonNestableTask( |
- FROM_HERE, Bind(&OrderedFunc, &order, 1)); |
+ FROM_HERE, BindOnce(&OrderedFunc, &order, 1)); |
ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, |
- Bind(&OrderedFunc, &order, 2)); |
+ BindOnce(&OrderedFunc, &order, 2)); |
ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, |
- Bind(&QuitFunc, &order, 3)); |
+ BindOnce(&QuitFunc, &order, 3)); |
RunLoop().Run(); |
// FIFO order. |
@@ -690,17 +696,18 @@ void RunTest_NonNestableInNestedLoop(MessagePumpFactory factory) { |
TaskList order; |
ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, |
- Bind(&FuncThatPumps, &order, 1)); |
+ BindOnce(&FuncThatPumps, &order, 1)); |
ThreadTaskRunnerHandle::Get()->PostNonNestableTask( |
- FROM_HERE, Bind(&OrderedFunc, &order, 2)); |
+ FROM_HERE, BindOnce(&OrderedFunc, &order, 2)); |
ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, |
- Bind(&OrderedFunc, &order, 3)); |
+ BindOnce(&OrderedFunc, &order, 3)); |
ThreadTaskRunnerHandle::Get()->PostTask( |
- FROM_HERE, Bind(&SleepFunc, &order, 4, TimeDelta::FromMilliseconds(50))); |
+ FROM_HERE, |
+ BindOnce(&SleepFunc, &order, 4, TimeDelta::FromMilliseconds(50))); |
ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, |
- Bind(&OrderedFunc, &order, 5)); |
+ BindOnce(&OrderedFunc, &order, 5)); |
ThreadTaskRunnerHandle::Get()->PostNonNestableTask( |
- FROM_HERE, Bind(&QuitFunc, &order, 6)); |
+ FROM_HERE, BindOnce(&QuitFunc, &order, 6)); |
RunLoop().Run(); |
@@ -742,15 +749,17 @@ void RunTest_QuitNow(MessagePumpFactory factory) { |
RunLoop run_loop; |
ThreadTaskRunnerHandle::Get()->PostTask( |
- FROM_HERE, Bind(&FuncThatRuns, &order, 1, Unretained(&run_loop))); |
+ FROM_HERE, BindOnce(&FuncThatRuns, &order, 1, Unretained(&run_loop))); |
ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, |
- Bind(&OrderedFunc, &order, 2)); |
- ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, Bind(&FuncThatQuitsNow)); |
+ BindOnce(&OrderedFunc, &order, 2)); |
ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, |
- Bind(&OrderedFunc, &order, 3)); |
- ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, Bind(&FuncThatQuitsNow)); |
+ BindOnce(&FuncThatQuitsNow)); |
+ ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, |
+ BindOnce(&OrderedFunc, &order, 3)); |
+ ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, |
+ BindOnce(&FuncThatQuitsNow)); |
ThreadTaskRunnerHandle::Get()->PostTask( |
- FROM_HERE, Bind(&OrderedFunc, &order, 4)); // never runs |
+ FROM_HERE, BindOnce(&OrderedFunc, &order, 4)); // never runs |
RunLoop().Run(); |
@@ -776,11 +785,12 @@ void RunTest_RunLoopQuitTop(MessagePumpFactory factory) { |
RunLoop nested_run_loop; |
ThreadTaskRunnerHandle::Get()->PostTask( |
- FROM_HERE, Bind(&FuncThatRuns, &order, 1, Unretained(&nested_run_loop))); |
+ FROM_HERE, |
+ BindOnce(&FuncThatRuns, &order, 1, Unretained(&nested_run_loop))); |
ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, |
outer_run_loop.QuitClosure()); |
ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, |
- Bind(&OrderedFunc, &order, 2)); |
+ BindOnce(&OrderedFunc, &order, 2)); |
ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, |
nested_run_loop.QuitClosure()); |
@@ -806,11 +816,12 @@ void RunTest_RunLoopQuitNested(MessagePumpFactory factory) { |
RunLoop nested_run_loop; |
ThreadTaskRunnerHandle::Get()->PostTask( |
- FROM_HERE, Bind(&FuncThatRuns, &order, 1, Unretained(&nested_run_loop))); |
+ FROM_HERE, |
+ BindOnce(&FuncThatRuns, &order, 1, Unretained(&nested_run_loop))); |
ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, |
nested_run_loop.QuitClosure()); |
ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, |
- Bind(&OrderedFunc, &order, 2)); |
+ BindOnce(&OrderedFunc, &order, 2)); |
ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, |
outer_run_loop.QuitClosure()); |
@@ -837,11 +848,12 @@ void RunTest_RunLoopQuitBogus(MessagePumpFactory factory) { |
RunLoop bogus_run_loop; |
ThreadTaskRunnerHandle::Get()->PostTask( |
- FROM_HERE, Bind(&FuncThatRuns, &order, 1, Unretained(&nested_run_loop))); |
+ FROM_HERE, |
+ BindOnce(&FuncThatRuns, &order, 1, Unretained(&nested_run_loop))); |
ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, |
bogus_run_loop.QuitClosure()); |
ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, |
- Bind(&OrderedFunc, &order, 2)); |
+ BindOnce(&OrderedFunc, &order, 2)); |
ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, |
outer_run_loop.QuitClosure()); |
ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, |
@@ -872,35 +884,35 @@ void RunTest_RunLoopQuitDeep(MessagePumpFactory factory) { |
RunLoop nested_loop4; |
ThreadTaskRunnerHandle::Get()->PostTask( |
- FROM_HERE, Bind(&FuncThatRuns, &order, 1, Unretained(&nested_loop1))); |
+ FROM_HERE, BindOnce(&FuncThatRuns, &order, 1, Unretained(&nested_loop1))); |
ThreadTaskRunnerHandle::Get()->PostTask( |
- FROM_HERE, Bind(&FuncThatRuns, &order, 2, Unretained(&nested_loop2))); |
+ FROM_HERE, BindOnce(&FuncThatRuns, &order, 2, Unretained(&nested_loop2))); |
ThreadTaskRunnerHandle::Get()->PostTask( |
- FROM_HERE, Bind(&FuncThatRuns, &order, 3, Unretained(&nested_loop3))); |
+ FROM_HERE, BindOnce(&FuncThatRuns, &order, 3, Unretained(&nested_loop3))); |
ThreadTaskRunnerHandle::Get()->PostTask( |
- FROM_HERE, Bind(&FuncThatRuns, &order, 4, Unretained(&nested_loop4))); |
+ FROM_HERE, BindOnce(&FuncThatRuns, &order, 4, Unretained(&nested_loop4))); |
ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, |
- Bind(&OrderedFunc, &order, 5)); |
+ BindOnce(&OrderedFunc, &order, 5)); |
ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, |
outer_run_loop.QuitClosure()); |
ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, |
- Bind(&OrderedFunc, &order, 6)); |
+ BindOnce(&OrderedFunc, &order, 6)); |
ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, |
nested_loop1.QuitClosure()); |
ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, |
- Bind(&OrderedFunc, &order, 7)); |
+ BindOnce(&OrderedFunc, &order, 7)); |
ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, |
nested_loop2.QuitClosure()); |
ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, |
- Bind(&OrderedFunc, &order, 8)); |
+ BindOnce(&OrderedFunc, &order, 8)); |
ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, |
nested_loop3.QuitClosure()); |
ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, |
- Bind(&OrderedFunc, &order, 9)); |
+ BindOnce(&OrderedFunc, &order, 9)); |
ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, |
nested_loop4.QuitClosure()); |
ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, |
- Bind(&OrderedFunc, &order, 10)); |
+ BindOnce(&OrderedFunc, &order, 10)); |
outer_run_loop.Run(); |
@@ -939,9 +951,9 @@ void RunTest_RunLoopQuitOrderBefore(MessagePumpFactory factory) { |
run_loop.Quit(); |
ThreadTaskRunnerHandle::Get()->PostTask( |
- FROM_HERE, Bind(&OrderedFunc, &order, 1)); // never runs |
+ FROM_HERE, BindOnce(&OrderedFunc, &order, 1)); // never runs |
ThreadTaskRunnerHandle::Get()->PostTask( |
- FROM_HERE, Bind(&FuncThatQuitsNow)); // never runs |
+ FROM_HERE, BindOnce(&FuncThatQuitsNow)); // never runs |
run_loop.Run(); |
@@ -958,12 +970,12 @@ void RunTest_RunLoopQuitOrderDuring(MessagePumpFactory factory) { |
RunLoop run_loop; |
ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, |
- Bind(&OrderedFunc, &order, 1)); |
+ BindOnce(&OrderedFunc, &order, 1)); |
ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, run_loop.QuitClosure()); |
ThreadTaskRunnerHandle::Get()->PostTask( |
- FROM_HERE, Bind(&OrderedFunc, &order, 2)); // never runs |
+ FROM_HERE, BindOnce(&OrderedFunc, &order, 2)); // never runs |
ThreadTaskRunnerHandle::Get()->PostTask( |
- FROM_HERE, Bind(&FuncThatQuitsNow)); // never runs |
+ FROM_HERE, BindOnce(&FuncThatQuitsNow)); // never runs |
run_loop.Run(); |
@@ -984,17 +996,19 @@ void RunTest_RunLoopQuitOrderAfter(MessagePumpFactory factory) { |
RunLoop run_loop; |
ThreadTaskRunnerHandle::Get()->PostTask( |
- FROM_HERE, Bind(&FuncThatRuns, &order, 1, Unretained(&run_loop))); |
+ FROM_HERE, BindOnce(&FuncThatRuns, &order, 1, Unretained(&run_loop))); |
+ ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, |
+ BindOnce(&OrderedFunc, &order, 2)); |
ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, |
- Bind(&OrderedFunc, &order, 2)); |
- ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, Bind(&FuncThatQuitsNow)); |
+ BindOnce(&FuncThatQuitsNow)); |
ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, |
- Bind(&OrderedFunc, &order, 3)); |
+ BindOnce(&OrderedFunc, &order, 3)); |
ThreadTaskRunnerHandle::Get()->PostTask( |
FROM_HERE, run_loop.QuitClosure()); // has no affect |
ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, |
- Bind(&OrderedFunc, &order, 4)); |
- ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, Bind(&FuncThatQuitsNow)); |
+ BindOnce(&OrderedFunc, &order, 4)); |
+ ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, |
+ BindOnce(&FuncThatQuitsNow)); |
RunLoop outer_run_loop; |
outer_run_loop.Run(); |
@@ -1015,7 +1029,7 @@ void RunTest_RunLoopQuitOrderAfter(MessagePumpFactory factory) { |
void PostNTasksThenQuit(int posts_remaining) { |
if (posts_remaining > 1) { |
ThreadTaskRunnerHandle::Get()->PostTask( |
- FROM_HERE, Bind(&PostNTasksThenQuit, posts_remaining - 1)); |
+ FROM_HERE, BindOnce(&PostNTasksThenQuit, posts_remaining - 1)); |
} else { |
MessageLoop::current()->QuitWhenIdle(); |
} |
@@ -1033,7 +1047,8 @@ void RunTest_RecursivePosts(MessagePumpFactory factory) { |
const int kNumTimes = 1 << 17; |
std::unique_ptr<MessagePump> pump(factory()); |
MessageLoop loop(std::move(pump)); |
- loop.task_runner()->PostTask(FROM_HERE, Bind(&PostNTasksThenQuit, kNumTimes)); |
+ loop.task_runner()->PostTask(FROM_HERE, |
+ BindOnce(&PostNTasksThenQuit, kNumTimes)); |
RunLoop().Run(); |
} |