Replace Closure in TaskRunner::PostTask with OneShotCallback

base/message_loop/message_loop.cc

 // Copyright 2013 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/message_loop/message_loop.h"
 
 #include <algorithm>
 #include <memory>
 #include <utility>
 
@@ skipping 259 matching lines @@
   DCHECK_EQ(this, current());
   nesting_observers_.AddObserver(observer);
 }
 
 void MessageLoop::RemoveNestingObserver(NestingObserver* observer) {
   DCHECK_EQ(this, current());
   nesting_observers_.RemoveObserver(observer);
 }
 
 #if !(defined(OS_MACOSX) && !defined(OS_IOS))
-void MessageLoop::PostTask(
-    const tracked_objects::Location& from_here,
-    const Closure& task) {
-  task_runner_->PostTask(from_here, task);
+void MessageLoop::PostTask(const tracked_objects::Location& from_here,
+                           OnceClosure task) {
+  task_runner_->PostTask(from_here, std::move(task));
 }
 
-void MessageLoop::PostDelayedTask(
-    const tracked_objects::Location& from_here,
-    const Closure& task,
-    TimeDelta delay) {
-  task_runner_->PostDelayedTask(from_here, task, delay);
+void MessageLoop::PostDelayedTask(const tracked_objects::Location& from_here,
+                                  OnceClosure task,
+                                  TimeDelta delay) {
+  task_runner_->PostDelayedTask(from_here, std::move(task), delay);
 }
 #endif  // !(defined(OS_MACOSX) && !defined(OS_IOS))
 
 void MessageLoop::Run() {
   DCHECK(pump_);
   RunLoop run_loop;
   run_loop.Run();
 }
 
 void MessageLoop::RunUntilIdle() {
@@ skipping 150 matching lines @@
   pump_->Run(this);
 }
 
 bool MessageLoop::ProcessNextDelayedNonNestableTask() {
   if (run_loop_->run_depth_ != 1)
     return false;
 
   if (deferred_non_nestable_work_queue_.empty())
     return false;
 
-  PendingTask pending_task =
-      std::move(deferred_non_nestable_work_queue_.front());
+  PendingTask pending_task = std::move(
+      const_cast<PendingTask&>(deferred_non_nestable_work_queue_.front()));
   deferred_non_nestable_work_queue_.pop();
 
-  RunTask(pending_task);
+  RunTask(std::move(pending_task));
   return true;
 }
 
-void MessageLoop::RunTask(const PendingTask& pending_task) {
+void MessageLoop::RunTask(PendingTask pending_task) {
   DCHECK(nestable_tasks_allowed_);
 
 #if defined(OS_WIN)
   if (pending_task.is_high_res) {
     pending_high_res_tasks_--;
     CHECK_GE(pending_high_res_tasks_, 0);
   }
 #endif
 
   // Execute the task and assume the worst: It is probably not reentrant.
   nestable_tasks_allowed_ = false;
 
   HistogramEvent(kTaskRunEvent);
 
   TRACE_TASK_EXECUTION("MessageLoop::RunTask", pending_task);
 
   FOR_EACH_OBSERVER(TaskObserver, task_observers_,
                     WillProcessTask(pending_task));
-  task_annotator_.RunTask("MessageLoop::PostTask", pending_task);
+  task_annotator_.RunTask("MessageLoop::PostTask", &pending_task);
   FOR_EACH_OBSERVER(TaskObserver, task_observers_,
                     DidProcessTask(pending_task));
 
   nestable_tasks_allowed_ = true;
 }
 
 bool MessageLoop::DeferOrRunPendingTask(PendingTask pending_task) {
   if (pending_task.nestable || run_loop_->run_depth_ == 1) {
-    RunTask(pending_task);
+    RunTask(std::move(pending_task));
     // Show that we ran a task (Note: a new one might arrive as a
     // consequence!).
     return true;
   }
 
   // We couldn't run the task now because we're in a nested message loop
   // and the task isn't nestable.
   deferred_non_nestable_work_queue_.push(std::move(pending_task));
   return false;
 }
@@ skipping 267 matching lines @@
       persistent,
       mode,
       controller,
       delegate);
 }
 #endif
 
 #endif  // !defined(OS_NACL_SFI)
 
 }  // namespace base