Rewrite base::Bind into base::BindOnce on trivial cases in base

base/task_scheduler/scheduler_single_thread_task_runner_manager_unittest.cc

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/task_scheduler/scheduler_single_thread_task_runner_manager.h"
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "base/synchronization/lock.h"
 #include "base/synchronization/waitable_event.h"
@@ skipping 106 matching lines @@
           ->CreateSingleThreadTaskRunnerWithTraits(
               TaskTraits().WithShutdownBehavior(
                   TaskShutdownBehavior::BLOCK_SHUTDOWN));
   scoped_refptr<SingleThreadTaskRunner> task_runner_2 =
       single_thread_task_runner_manager_
           ->CreateSingleThreadTaskRunnerWithTraits(
               TaskTraits().WithShutdownBehavior(
                   TaskShutdownBehavior::BLOCK_SHUTDOWN));
 
   PlatformThreadRef thread_ref_1;
-  task_runner_1->PostTask(FROM_HERE, Bind(&CaptureThreadRef, &thread_ref_1));
+  task_runner_1->PostTask(FROM_HERE,
+                          BindOnce(&CaptureThreadRef, &thread_ref_1));
   PlatformThreadRef thread_ref_2;
-  task_runner_2->PostTask(FROM_HERE, Bind(&CaptureThreadRef, &thread_ref_2));
+  task_runner_2->PostTask(FROM_HERE,
+                          BindOnce(&CaptureThreadRef, &thread_ref_2));
 
   task_tracker_.Shutdown();
 
   ASSERT_FALSE(thread_ref_1.is_null());
   ASSERT_FALSE(thread_ref_2.is_null());
   EXPECT_NE(thread_ref_1, thread_ref_2);
 }
 
 TEST_F(TaskSchedulerSingleThreadTaskRunnerManagerTest, PrioritySetCorrectly) {
   // Why are events used here instead of the task tracker?
   // Shutting down can cause priorities to get raised. This means we have to use
   // events to determine when a task is run.
   scoped_refptr<SingleThreadTaskRunner> task_runner_background =
       single_thread_task_runner_manager_
           ->CreateSingleThreadTaskRunnerWithTraits(
               TaskTraits().WithPriority(TaskPriority::BACKGROUND));
   scoped_refptr<SingleThreadTaskRunner> task_runner_user_visible =
       single_thread_task_runner_manager_
           ->CreateSingleThreadTaskRunnerWithTraits(
               TaskTraits().WithPriority(TaskPriority::USER_VISIBLE));
   scoped_refptr<SingleThreadTaskRunner> task_runner_user_blocking =
       single_thread_task_runner_manager_
           ->CreateSingleThreadTaskRunnerWithTraits(
               TaskTraits()
                   .WithPriority(TaskPriority::USER_BLOCKING)
                   .WithShutdownBehavior(TaskShutdownBehavior::BLOCK_SHUTDOWN));
 
   ThreadPriority thread_priority_background;
   task_runner_background->PostTask(
-      FROM_HERE, Bind(&CaptureThreadPriority, &thread_priority_background));
+      FROM_HERE, BindOnce(&CaptureThreadPriority, &thread_priority_background));
   WaitableEvent waitable_event_background(
       WaitableEvent::ResetPolicy::MANUAL,
       WaitableEvent::InitialState::NOT_SIGNALED);
   task_runner_background->PostTask(
       FROM_HERE,
-      Bind(&WaitableEvent::Signal, Unretained(&waitable_event_background)));
+      BindOnce(&WaitableEvent::Signal, Unretained(&waitable_event_background)));
 
   ThreadPriority thread_priority_user_visible;
   task_runner_user_visible->PostTask(
-      FROM_HERE, Bind(&CaptureThreadPriority, &thread_priority_user_visible));
+      FROM_HERE,
+      BindOnce(&CaptureThreadPriority, &thread_priority_user_visible));
   WaitableEvent waitable_event_user_visible(
       WaitableEvent::ResetPolicy::MANUAL,
       WaitableEvent::InitialState::NOT_SIGNALED);
   task_runner_user_visible->PostTask(
-      FROM_HERE,
-      Bind(&WaitableEvent::Signal, Unretained(&waitable_event_user_visible)));
+      FROM_HERE, BindOnce(&WaitableEvent::Signal,
+                          Unretained(&waitable_event_user_visible)));
 
   ThreadPriority thread_priority_user_blocking;
   task_runner_user_blocking->PostTask(
-      FROM_HERE, Bind(&CaptureThreadPriority, &thread_priority_user_blocking));
+      FROM_HERE,
+      BindOnce(&CaptureThreadPriority, &thread_priority_user_blocking));
   WaitableEvent waitable_event_user_blocking(
       WaitableEvent::ResetPolicy::MANUAL,
       WaitableEvent::InitialState::NOT_SIGNALED);
   task_runner_user_blocking->PostTask(
-      FROM_HERE,
-      Bind(&WaitableEvent::Signal, Unretained(&waitable_event_user_blocking)));
+      FROM_HERE, BindOnce(&WaitableEvent::Signal,
+                          Unretained(&waitable_event_user_blocking)));
 
   waitable_event_background.Wait();
   waitable_event_user_visible.Wait();
   waitable_event_user_blocking.Wait();
 
   if (Lock::HandlesMultipleThreadPriorities())
     EXPECT_EQ(ThreadPriority::BACKGROUND, thread_priority_background);
   else
     EXPECT_EQ(ThreadPriority::NORMAL, thread_priority_background);
   EXPECT_EQ(ThreadPriority::NORMAL, thread_priority_user_visible);
   EXPECT_EQ(ThreadPriority::NORMAL, thread_priority_user_blocking);
 }
 
 TEST_F(TaskSchedulerSingleThreadTaskRunnerManagerTest, PostTaskAfterShutdown) {
   auto task_runner = single_thread_task_runner_manager_
                          ->CreateSingleThreadTaskRunnerWithTraits(TaskTraits());
   task_tracker_.Shutdown();
-  EXPECT_FALSE(task_runner->PostTask(FROM_HERE, Bind(&ShouldNotRun)));
+  EXPECT_FALSE(task_runner->PostTask(FROM_HERE, BindOnce(&ShouldNotRun)));
 }
 
 // Verify that a Task runs shortly after its delay expires.
 TEST_F(TaskSchedulerSingleThreadTaskRunnerManagerTest, PostDelayedTask) {
   TimeTicks start_time = TimeTicks::Now();
 
   // Post a task with a short delay.
   WaitableEvent task_ran(WaitableEvent::ResetPolicy::MANUAL,
                          WaitableEvent::InitialState::NOT_SIGNALED);
   auto task_runner = single_thread_task_runner_manager_
                          ->CreateSingleThreadTaskRunnerWithTraits(TaskTraits());
   EXPECT_TRUE(task_runner->PostDelayedTask(
-      FROM_HERE, Bind(&WaitableEvent::Signal, Unretained(&task_ran)),
+      FROM_HERE, BindOnce(&WaitableEvent::Signal, Unretained(&task_ran)),
       TestTimeouts::tiny_timeout()));
 
   // Wait until the task runs.
   task_ran.Wait();
 
   // Expect the task to run after its delay expires, but not more than 250 ms
   // after that.
   const TimeDelta actual_delay = TimeTicks::Now() - start_time;
   EXPECT_GE(actual_delay, TestTimeouts::tiny_timeout());
   EXPECT_LT(actual_delay,
@@ skipping 10 matching lines @@
   scoped_refptr<SingleThreadTaskRunner> task_runner_2 =
       single_thread_task_runner_manager_
           ->CreateSingleThreadTaskRunnerWithTraits(
               TaskTraits().WithShutdownBehavior(
                   TaskShutdownBehavior::BLOCK_SHUTDOWN));
 
   EXPECT_FALSE(task_runner_1->RunsTasksOnCurrentThread());
   EXPECT_FALSE(task_runner_2->RunsTasksOnCurrentThread());
 
   task_runner_1->PostTask(
-      FROM_HERE, Bind(
+      FROM_HERE, BindOnce(
                      [](scoped_refptr<SingleThreadTaskRunner> task_runner_1,
                         scoped_refptr<SingleThreadTaskRunner> task_runner_2) {
                        EXPECT_TRUE(task_runner_1->RunsTasksOnCurrentThread());
                        EXPECT_FALSE(task_runner_2->RunsTasksOnCurrentThread());
                      },
                      task_runner_1, task_runner_2));
 
   task_runner_2->PostTask(
-      FROM_HERE, Bind(
+      FROM_HERE, BindOnce(
                      [](scoped_refptr<SingleThreadTaskRunner> task_runner_1,
                         scoped_refptr<SingleThreadTaskRunner> task_runner_2) {
                        EXPECT_FALSE(task_runner_1->RunsTasksOnCurrentThread());
                        EXPECT_TRUE(task_runner_2->RunsTasksOnCurrentThread());
                      },
                      task_runner_1, task_runner_2));
 
   task_tracker_.Shutdown();
 }
 
@@ skipping 48 matching lines @@
   WaitableEvent task_running(WaitableEvent::ResetPolicy::MANUAL,
                              WaitableEvent::InitialState::NOT_SIGNALED);
   WaitableEvent task_blocking(WaitableEvent::ResetPolicy::MANUAL,
                               WaitableEvent::InitialState::NOT_SIGNALED);
 
   {
     auto task_runner = single_thread_task_runner_manager_
                            ->CreateSingleThreadTaskRunnerWithTraits(
                                TaskTraits().WithBaseSyncPrimitives());
     EXPECT_TRUE(task_runner->PostTask(
-        FROM_HERE, Bind(&WaitableEvent::Signal, Unretained(&task_running))));
+        FROM_HERE,
+        BindOnce(&WaitableEvent::Signal, Unretained(&task_running))));
     EXPECT_TRUE(task_runner->PostTask(
-        FROM_HERE, Bind(&WaitableEvent::Wait, Unretained(&task_blocking))));
+        FROM_HERE, BindOnce(&WaitableEvent::Wait, Unretained(&task_blocking))));
   }
 
   task_running.Wait();
   CallJoinFromDifferentThread join_from_different_thread(
       single_thread_task_runner_manager_.get());
   join_from_different_thread.Start();
   join_from_different_thread.WaitForRunToStart();
   task_blocking.Signal();
   join_from_different_thread.Join();
 }
 
 TEST_F(TaskSchedulerSingleThreadTaskRunnerManagerJoinTest,
        ConcurrentJoinExtraSkippedTask) {
   // Tests to make sure that tasks are properly cleaned up at Join, allowing
   // SingleThreadTaskRunners to unregister themselves.
   WaitableEvent task_running(WaitableEvent::ResetPolicy::MANUAL,
                              WaitableEvent::InitialState::NOT_SIGNALED);
   WaitableEvent task_blocking(WaitableEvent::ResetPolicy::MANUAL,
                               WaitableEvent::InitialState::NOT_SIGNALED);
 
   {
     auto task_runner = single_thread_task_runner_manager_
                            ->CreateSingleThreadTaskRunnerWithTraits(
                                TaskTraits().WithBaseSyncPrimitives());
     EXPECT_TRUE(task_runner->PostTask(
-        FROM_HERE, Bind(&WaitableEvent::Signal, Unretained(&task_running))));
+        FROM_HERE,
+        BindOnce(&WaitableEvent::Signal, Unretained(&task_running))));
     EXPECT_TRUE(task_runner->PostTask(
-        FROM_HERE, Bind(&WaitableEvent::Wait, Unretained(&task_blocking))));
-    EXPECT_TRUE(task_runner->PostTask(FROM_HERE, Bind(&DoNothing)));
+        FROM_HERE, BindOnce(&WaitableEvent::Wait, Unretained(&task_blocking))));
+    EXPECT_TRUE(task_runner->PostTask(FROM_HERE, BindOnce(&DoNothing)));
   }
 
   task_running.Wait();
   CallJoinFromDifferentThread join_from_different_thread(
       single_thread_task_runner_manager_.get());
   join_from_different_thread.Start();
   join_from_different_thread.WaitForRunToStart();
   task_blocking.Signal();
   join_from_different_thread.Join();
 }
@@ skipping 88 matching lines @@
   com_task_runner->PostTask(
       FROM_HERE, Bind([](HWND hwnd) { ::DestroyWindow(hwnd); }, hwnd));
 
   task_tracker_.Shutdown();
 }
 
 #endif  // defined(OS_WIN)
 
 }  // namespace internal
 }  // namespace base