task posting v3: TaskRunnerHandle => CurrentDefaultHandle in //base
This refactor was performed with the following scripts:
shell:
https://paste.googleplex.com/6285820754395136
python:
https://paste.googleplex.com/6260505546063872
This does a few sed-like modifications, changing calls to methods of
[...]TaskRunnerHandle to calls to methods of
[...]TaskRunner::CurrentDefaultHandle, using new types for overrides,
and swapping includes.
Bug: 1026641
Change-Id: Ie9ab64c7d63efb379bd37d4def8d49d5d447ee69
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4065947
Auto-Submit: Sean Maher <[email protected]>
Reviewed-by: Gabriel Charette <[email protected]>
Commit-Queue: Gabriel Charette <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1081280}
diff --git a/base/message_loop/message_pump_glib_unittest.cc b/base/message_loop/message_pump_glib_unittest.cc
index 4f01fa9..7dc69083 100644
--- a/base/message_loop/message_pump_glib_unittest.cc
+++ b/base/message_loop/message_pump_glib_unittest.cc
@@ -28,7 +28,6 @@
#include "base/task/single_thread_task_runner.h"
#include "base/test/task_environment.h"
#include "base/threading/thread.h"
-#include "base/threading/thread_task_runner_handle.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace base {
@@ -161,7 +160,8 @@
// Posts a task on the current message loop.
void PostMessageLoopTask(const Location& from_here, OnceClosure task) {
- ThreadTaskRunnerHandle::Get()->PostTask(from_here, std::move(task));
+ SingleThreadTaskRunner::GetCurrentDefault()->PostTask(from_here,
+ std::move(task));
}
// Test fixture.
@@ -239,14 +239,14 @@
// Tests that we process tasks while waiting for new events.
// The event queue is empty at first.
for (int i = 0; i < 10; ++i) {
- ThreadTaskRunnerHandle::Get()->PostTask(
+ SingleThreadTaskRunner::GetCurrentDefault()->PostTask(
FROM_HERE, BindOnce(&IncrementInt, &task_count));
}
// After all the previous tasks have executed, enqueue an event that will
// quit.
{
RunLoop run_loop;
- ThreadTaskRunnerHandle::Get()->PostTask(
+ SingleThreadTaskRunner::GetCurrentDefault()->PostTask(
FROM_HERE, BindOnce(&EventInjector::AddEvent, Unretained(injector()), 0,
run_loop.QuitClosure()));
run_loop.Run();
@@ -258,7 +258,7 @@
injector()->Reset();
task_count = 0;
for (int i = 0; i < 10; ++i) {
- ThreadTaskRunnerHandle::Get()->PostDelayedTask(
+ SingleThreadTaskRunner::GetCurrentDefault()->PostDelayedTask(
FROM_HERE, BindOnce(&IncrementInt, &task_count), Milliseconds(10 * i));
}
// After all the previous tasks have executed, enqueue an event that will
@@ -267,7 +267,7 @@
// That is verified in message_loop_unittest.cc.
{
RunLoop run_loop;
- ThreadTaskRunnerHandle::Get()->PostDelayedTask(
+ SingleThreadTaskRunner::GetCurrentDefault()->PostDelayedTask(
FROM_HERE,
BindOnce(&EventInjector::AddEvent, Unretained(injector()), 0,
run_loop.QuitClosure()),
@@ -321,7 +321,7 @@
if (task_count_ == 0 && event_count_ == 0) {
std::move(done_closure_).Run();
} else {
- ThreadTaskRunnerHandle::Get()->PostTask(
+ SingleThreadTaskRunner::GetCurrentDefault()->PostTask(
FROM_HERE, BindOnce(&ConcurrentHelper::FromTask, this));
}
}
@@ -373,9 +373,9 @@
injector()->AddEventAsTask(0, BindOnce(&ConcurrentHelper::FromEvent, helper));
// Similarly post 2 tasks.
- ThreadTaskRunnerHandle::Get()->PostTask(
+ SingleThreadTaskRunner::GetCurrentDefault()->PostTask(
FROM_HERE, BindOnce(&ConcurrentHelper::FromTask, helper));
- ThreadTaskRunnerHandle::Get()->PostTask(
+ SingleThreadTaskRunner::GetCurrentDefault()->PostTask(
FROM_HERE, BindOnce(&ConcurrentHelper::FromTask, helper));
run_loop.Run();
@@ -393,8 +393,8 @@
injector->AddEvent(0, std::move(on_drained));
// Post a couple of dummy tasks
- ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, DoNothing());
- ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, DoNothing());
+ SingleThreadTaskRunner::GetCurrentDefault()->PostTask(FROM_HERE, DoNothing());
+ SingleThreadTaskRunner::GetCurrentDefault()->PostTask(FROM_HERE, DoNothing());
// Drain the events
while (g_main_context_pending(nullptr)) {
@@ -407,7 +407,7 @@
TEST_F(MessagePumpGLibTest, TestDrainingGLib) {
// Tests that draining events using GLib works.
RunLoop run_loop;
- ThreadTaskRunnerHandle::Get()->PostTask(
+ SingleThreadTaskRunner::GetCurrentDefault()->PostTask(
FROM_HERE, BindOnce(&AddEventsAndDrainGLib, Unretained(injector()),
run_loop.QuitClosure()));
run_loop.Run();
@@ -458,17 +458,17 @@
injector->AddDummyEvent(0);
injector->AddDummyEvent(0);
// Post a couple of dummy tasks
- ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
- BindOnce(&IncrementInt, &task_count));
- ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
- BindOnce(&IncrementInt, &task_count));
+ SingleThreadTaskRunner::GetCurrentDefault()->PostTask(
+ FROM_HERE, BindOnce(&IncrementInt, &task_count));
+ SingleThreadTaskRunner::GetCurrentDefault()->PostTask(
+ FROM_HERE, BindOnce(&IncrementInt, &task_count));
// Delayed events
injector->AddDummyEvent(10);
injector->AddDummyEvent(10);
// Delayed work
- ThreadTaskRunnerHandle::Get()->PostDelayedTask(
+ SingleThreadTaskRunner::GetCurrentDefault()->PostDelayedTask(
FROM_HERE, BindOnce(&IncrementInt, &task_count), Milliseconds(30));
- ThreadTaskRunnerHandle::Get()->PostDelayedTask(
+ SingleThreadTaskRunner::GetCurrentDefault()->PostDelayedTask(
FROM_HERE, BindOnce(&GLibLoopRunner::Quit, runner), Milliseconds(40));
// Run a nested, straight GLib message loop.
@@ -490,17 +490,17 @@
injector->AddDummyEvent(0);
injector->AddDummyEvent(0);
// Post a couple of dummy tasks
- ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
- BindOnce(&IncrementInt, &task_count));
- ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
- BindOnce(&IncrementInt, &task_count));
+ SingleThreadTaskRunner::GetCurrentDefault()->PostTask(
+ FROM_HERE, BindOnce(&IncrementInt, &task_count));
+ SingleThreadTaskRunner::GetCurrentDefault()->PostTask(
+ FROM_HERE, BindOnce(&IncrementInt, &task_count));
// Delayed events
injector->AddDummyEvent(10);
injector->AddDummyEvent(10);
// Delayed work
- ThreadTaskRunnerHandle::Get()->PostDelayedTask(
+ SingleThreadTaskRunner::GetCurrentDefault()->PostDelayedTask(
FROM_HERE, BindOnce(&IncrementInt, &task_count), Milliseconds(30));
- ThreadTaskRunnerHandle::Get()->PostDelayedTask(
+ SingleThreadTaskRunner::GetCurrentDefault()->PostDelayedTask(
FROM_HERE, BindOnce(&GLibLoopRunner::Quit, runner), Milliseconds(40));
// Run a nested, straight Gtk message loop.
@@ -522,7 +522,7 @@
// Note that in this case we don't make strong guarantees about niceness
// between events and posted tasks.
RunLoop run_loop;
- ThreadTaskRunnerHandle::Get()->PostTask(
+ SingleThreadTaskRunner::GetCurrentDefault()->PostTask(
FROM_HERE, BindOnce(&TestGLibLoopInternal, Unretained(injector()),
run_loop.QuitClosure()));
run_loop.Run();
@@ -534,7 +534,7 @@
// Note that in this case we don't make strong guarantees about niceness
// between events and posted tasks.
RunLoop run_loop;
- ThreadTaskRunnerHandle::Get()->PostTask(
+ SingleThreadTaskRunner::GetCurrentDefault()->PostTask(
FROM_HERE, BindOnce(&TestGtkLoopInternal, Unretained(injector()),
run_loop.QuitClosure()));
run_loop.Run();
@@ -637,7 +637,8 @@
std::move(quit_closure).Run();
RunLoop runloop(RunLoop::Type::kNestableTasksAllowed);
- ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, runloop.QuitClosure());
+ SingleThreadTaskRunner::GetCurrentDefault()->PostTask(FROM_HERE,
+ runloop.QuitClosure());
runloop.Run();
}
@@ -648,7 +649,7 @@
void OnFileCanReadWithoutBlocking(int /* fd */) override {
RunLoop runloop;
- ThreadTaskRunnerHandle::Get()->PostTask(
+ SingleThreadTaskRunner::GetCurrentDefault()->PostTask(
FROM_HERE, BindOnce(&QuitMessageLoopAndStart, runloop.QuitClosure()));
runloop.Run();
}
@@ -748,7 +749,7 @@
std::move(write_fd_task), io_runner()));
// Queue |event| to signal on |CurrentUIThread::Get()|.
- ThreadTaskRunnerHandle::Get()->PostTask(
+ SingleThreadTaskRunner::GetCurrentDefault()->PostTask(
FROM_HERE, BindOnce(&WaitableEvent::Signal, Unretained(&event)));
// Now run the MessageLoop.
