| Index: base/task/cancelable_task_tracker_unittest.cc
|
| diff --git a/base/task/cancelable_task_tracker_unittest.cc b/base/task/cancelable_task_tracker_unittest.cc
|
| index fd480f3687511a7fadbf13f5fc0f7014a9a5e7fe..a16f5af95fa9afdcd032a08faee83ddc9fc2b399 100644
|
| --- a/base/task/cancelable_task_tracker_unittest.cc
|
| +++ b/base/task/cancelable_task_tracker_unittest.cc
|
| @@ -194,14 +194,14 @@ TEST_F(CancelableTaskTrackerTest, NewTrackedTaskIdDifferentThread) {
|
| Thread other_thread("other thread");
|
| ASSERT_TRUE(other_thread.Start());
|
| other_thread.task_runner()->PostTask(
|
| - FROM_HERE, Bind(&ExpectIsCanceled, is_canceled, false));
|
| + FROM_HERE, BindOnce(&ExpectIsCanceled, is_canceled, false));
|
| other_thread.Stop();
|
|
|
| task_tracker_.TryCancel(task_id);
|
|
|
| ASSERT_TRUE(other_thread.Start());
|
| other_thread.task_runner()->PostTask(
|
| - FROM_HERE, Bind(&ExpectIsCanceled, is_canceled, true));
|
| + FROM_HERE, BindOnce(&ExpectIsCanceled, is_canceled, true));
|
| other_thread.Stop();
|
| }
|
|
|
| @@ -364,8 +364,9 @@ TEST_F(CancelableTaskTrackerDeathTest, PostFromDifferentThread) {
|
| ASSERT_TRUE(bad_thread.Start());
|
|
|
| bad_thread.task_runner()->PostTask(
|
| - FROM_HERE, Bind(&MaybeRunDeadlyTaskTrackerMemberFunction,
|
| - Unretained(&task_tracker_), Bind(&PostDoNothingTask)));
|
| + FROM_HERE,
|
| + BindOnce(&MaybeRunDeadlyTaskTrackerMemberFunction,
|
| + Unretained(&task_tracker_), Bind(&PostDoNothingTask)));
|
| }
|
|
|
| void TryCancel(CancelableTaskTracker::TaskId task_id,
|
| @@ -385,8 +386,9 @@ TEST_F(CancelableTaskTrackerDeathTest, CancelOnDifferentThread) {
|
| EXPECT_NE(CancelableTaskTracker::kBadTaskId, task_id);
|
|
|
| bad_thread.task_runner()->PostTask(
|
| - FROM_HERE, Bind(&MaybeRunDeadlyTaskTrackerMemberFunction,
|
| - Unretained(&task_tracker_), Bind(&TryCancel, task_id)));
|
| + FROM_HERE,
|
| + BindOnce(&MaybeRunDeadlyTaskTrackerMemberFunction,
|
| + Unretained(&task_tracker_), Bind(&TryCancel, task_id)));
|
|
|
| test_task_runner->RunUntilIdle();
|
| }
|
| @@ -403,9 +405,9 @@ TEST_F(CancelableTaskTrackerDeathTest, CancelAllOnDifferentThread) {
|
| EXPECT_NE(CancelableTaskTracker::kBadTaskId, task_id);
|
|
|
| bad_thread.task_runner()->PostTask(
|
| - FROM_HERE,
|
| - Bind(&MaybeRunDeadlyTaskTrackerMemberFunction, Unretained(&task_tracker_),
|
| - Bind(&CancelableTaskTracker::TryCancelAll)));
|
| + FROM_HERE, BindOnce(&MaybeRunDeadlyTaskTrackerMemberFunction,
|
| + Unretained(&task_tracker_),
|
| + Bind(&CancelableTaskTracker::TryCancelAll)));
|
|
|
| test_task_runner->RunUntilIdle();
|
| }
|
|
|