Index: media/base/fake_single_thread_task_runner.cc |
diff --git a/media/base/fake_single_thread_task_runner.cc b/media/base/fake_single_thread_task_runner.cc |
index 77f1f73d3a4ef60c0931f4f548a2e2df8264ef22..9dd95386507b7ba5c0ad11fa554140096bdba6b8 100644 |
--- a/media/base/fake_single_thread_task_runner.cc |
+++ b/media/base/fake_single_thread_task_runner.cc |
@@ -4,6 +4,9 @@ |
#include "media/base/fake_single_thread_task_runner.h" |
+#include <utility> |
+ |
+#include "base/callback_helpers.h" |
#include "base/location.h" |
#include "base/logging.h" |
#include "base/time/tick_clock.h" |
@@ -18,7 +21,7 @@ FakeSingleThreadTaskRunner::~FakeSingleThreadTaskRunner() {} |
bool FakeSingleThreadTaskRunner::PostDelayedTask( |
const tracked_objects::Location& from_here, |
- const base::Closure& task, |
+ base::Closure task, |
base::TimeDelta delay) { |
if (fail_on_next_task_) { |
LOG(FATAL) << "Infinite task posting loop detected. Possibly caused by " |
@@ -40,16 +43,16 @@ bool FakeSingleThreadTaskRunner::PostDelayedTask( |
auto it = after_it; |
--it; |
if (it->first.first == run_time) { |
- tasks_.insert( |
- after_it /* hint */, |
- std::make_pair(TaskKey(run_time, it->first.second + 1), task)); |
+ tasks_.insert(after_it /* hint */, |
+ std::make_pair(TaskKey(run_time, it->first.second + 1), |
+ std::move(task))); |
return true; |
} |
} |
} |
// No tasks have the exact same run time, so just do a simple insert. |
- tasks_.insert(std::make_pair(TaskKey(run_time, 0), task)); |
+ tasks_.insert(std::make_pair(TaskKey(run_time, 0), std::move(task))); |
return true; |
} |
@@ -67,9 +70,9 @@ void FakeSingleThreadTaskRunner::RunTasks() { |
if (clock_->NowTicks() < it->first.first) |
return; |
- const base::Closure task = it->second; |
+ base::Closure task = std::move(it->second); |
tasks_.erase(it); |
- task.Run(); |
+ std::move(task).Run(); |
} |
} |
@@ -104,7 +107,7 @@ void FakeSingleThreadTaskRunner::Sleep(base::TimeDelta t) { |
bool FakeSingleThreadTaskRunner::PostNonNestableDelayedTask( |
const tracked_objects::Location& from_here, |
- const base::Closure& task, |
+ base::Closure task, |
base::TimeDelta delay) { |
NOTIMPLEMENTED(); |
return false; |