Index: base/message_loop/message_loop_unittest.cc |
diff --git a/base/message_loop/message_loop_unittest.cc b/base/message_loop/message_loop_unittest.cc |
index 9d771d5ecbd2493126f00085e8194b7eb32e699e..fe3c015f2588752b0322a1dfa1ace7096e5225ab 100644 |
--- a/base/message_loop/message_loop_unittest.cc |
+++ b/base/message_loop/message_loop_unittest.cc |
@@ -470,7 +470,7 @@ void RunTest_RecursiveSupport2(MessageLoop::Type message_loop_type) { |
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(); |
} |
@@ -682,7 +682,8 @@ TEST(MessageLoopTest, TaskObserver) { |
MessageLoop loop; |
loop.AddTaskObserver(&observer); |
- loop.task_runner()->PostTask(FROM_HERE, Bind(&PostNTasksThenQuit, kNumPosts)); |
+ loop.task_runner()->PostTask(FROM_HERE, |
+ BindOnce(&PostNTasksThenQuit, kNumPosts)); |
RunLoop().Run(); |
loop.RemoveTaskObserver(&observer); |
@@ -859,9 +860,10 @@ TEST(MessageLoopTest, DestructionObserverTest) { |
MLDestructionObserver observer(&task_destroyed, &destruction_observer_called); |
loop->AddDestructionObserver(&observer); |
loop->task_runner()->PostDelayedTask( |
- FROM_HERE, Bind(&DestructionObserverProbe::Run, |
- new DestructionObserverProbe( |
- &task_destroyed, &destruction_observer_called)), |
+ FROM_HERE, |
+ BindOnce(&DestructionObserverProbe::Run, |
+ new DestructionObserverProbe(&task_destroyed, |
+ &destruction_observer_called)), |
kDelay); |
delete loop; |
EXPECT_TRUE(observer.task_destroyed_before_message_loop()); |
@@ -878,13 +880,13 @@ TEST(MessageLoopTest, ThreadMainTaskRunner) { |
scoped_refptr<Foo> foo(new Foo()); |
std::string a("a"); |
- ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, Bind( |
- &Foo::Test1ConstRef, foo, a)); |
+ ThreadTaskRunnerHandle::Get()->PostTask( |
+ FROM_HERE, BindOnce(&Foo::Test1ConstRef, foo, a)); |
// Post quit task; |
ThreadTaskRunnerHandle::Get()->PostTask( |
FROM_HERE, |
- Bind(&MessageLoop::QuitWhenIdle, Unretained(MessageLoop::current()))); |
+ BindOnce(&MessageLoop::QuitWhenIdle, Unretained(MessageLoop::current()))); |
// Now kick things off |
RunLoop().Run(); |
@@ -1007,8 +1009,7 @@ TEST(MessageLoopTest, OriginalRunnerWorks) { |
loop.SetTaskRunner(new_runner); |
scoped_refptr<Foo> foo(new Foo()); |
- original_runner->PostTask(FROM_HERE, |
- Bind(&Foo::Test1ConstRef, foo, "a")); |
+ original_runner->PostTask(FROM_HERE, BindOnce(&Foo::Test1ConstRef, foo, "a")); |
RunLoop().RunUntilIdle(); |
EXPECT_EQ(1, foo->test_count()); |
} |