summaryrefslogtreecommitdiff
path: root/chromium/content/browser/startup_task_runner.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/content/browser/startup_task_runner.cc')
-rw-r--r--chromium/content/browser/startup_task_runner.cc18
1 files changed, 9 insertions, 9 deletions
diff --git a/chromium/content/browser/startup_task_runner.cc b/chromium/content/browser/startup_task_runner.cc
index 51c98506b14..62deb231b80 100644
--- a/chromium/content/browser/startup_task_runner.cc
+++ b/chromium/content/browser/startup_task_runner.cc
@@ -18,7 +18,7 @@ StartupTaskRunner::StartupTaskRunner(
StartupTaskRunner::~StartupTaskRunner() {}
void StartupTaskRunner::AddTask(StartupTask callback) {
- task_list_.push_back(callback);
+ task_list_.push_back(std::move(callback));
}
void StartupTaskRunner::StartRunningTasksAsync() {
@@ -29,16 +29,16 @@ void StartupTaskRunner::StartRunningTasksAsync() {
std::move(startup_complete_callback_).Run(result);
}
} else {
- const base::Closure next_task =
- base::Bind(&StartupTaskRunner::WrappedTask, base::Unretained(this));
- proxy_->PostNonNestableTask(FROM_HERE, next_task);
+ base::OnceClosure next_task =
+ base::BindOnce(&StartupTaskRunner::WrappedTask, base::Unretained(this));
+ proxy_->PostNonNestableTask(FROM_HERE, std::move(next_task));
}
}
void StartupTaskRunner::RunAllTasksNow() {
int result = 0;
for (auto it = task_list_.begin(); it != task_list_.end(); it++) {
- result = it->Run();
+ result = std::move(*it).Run();
if (result > 0) break;
}
task_list_.clear();
@@ -54,7 +54,7 @@ void StartupTaskRunner::WrappedTask() {
// so there is nothing to do
return;
}
- int result = task_list_.front().Run();
+ int result = std::move(task_list_.front()).Run();
task_list_.pop_front();
if (result > 0) {
// Stop now and throw away the remaining tasks
@@ -65,9 +65,9 @@ void StartupTaskRunner::WrappedTask() {
std::move(startup_complete_callback_).Run(result);
}
} else {
- const base::Closure next_task =
- base::Bind(&StartupTaskRunner::WrappedTask, base::Unretained(this));
- proxy_->PostNonNestableTask(FROM_HERE, next_task);
+ base::OnceClosure next_task =
+ base::BindOnce(&StartupTaskRunner::WrappedTask, base::Unretained(this));
+ proxy_->PostNonNestableTask(FROM_HERE, std::move(next_task));
}
}