Migrate BattOrConnectionImpl to new task running architecture
The unit tests already use TestMockTimeTaskRunner, which is compliant
with the new architecture.
Bug: 761498, 667892
Change-Id: I9230055fe2636d3690c88fe961713736e179981b
Reviewed-on: https://chromium-review.googlesource.com/652508
Commit-Queue: Charlie Andrews <charliea@chromium.org>
Reviewed-by: Francois Doray <fdoray@chromium.org>
Cr-Commit-Position: refs/heads/master@{#499967}
diff --git a/tools/battor_agent/battor_connection_impl.cc b/tools/battor_agent/battor_connection_impl.cc
index aa71ffc..cb79476 100644
--- a/tools/battor_agent/battor_connection_impl.cc
+++ b/tools/battor_agent/battor_connection_impl.cc
@@ -11,7 +11,7 @@
#include "base/command_line.h"
#include "base/memory/ptr_util.h"
#include "base/strings/stringprintf.h"
-#include "base/threading/thread_task_runner_handle.h"
+#include "base/threading/sequenced_task_runner_handle.h"
#include "base/time/default_tick_clock.h"
#include "device/serial/buffer.h"
#include "device/serial/serial_io_handler.h"
@@ -117,7 +117,7 @@
if (!success) {
Close();
- base::ThreadTaskRunnerHandle::Get()->PostTask(
+ base::SequencedTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::Bind(&Listener::OnConnectionOpened,
base::Unretained(listener_), false));
return;
@@ -294,7 +294,7 @@
LogSerial(StringPrintf("(message) Read finished with success: %d.", success));
pending_read_buffer_ = nullptr;
- base::ThreadTaskRunnerHandle::Get()->PostTask(
+ base::SequencedTaskRunnerHandle::Get()->PostTask(
FROM_HERE,
base::Bind(&Listener::OnMessageRead, base::Unretained(listener_), success,
type, base::Passed(std::move(bytes))));
@@ -326,7 +326,7 @@
void BattOrConnectionImpl::SetTimeout(base::TimeDelta timeout) {
timeout_callback_.Reset(
base::Bind(&BattOrConnectionImpl::CancelReadMessage, AsWeakPtr()));
- base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
+ base::SequencedTaskRunnerHandle::Get()->PostDelayedTask(
FROM_HERE, timeout_callback_.callback(), timeout);
}
@@ -341,7 +341,7 @@
"(flush) Read failed due to serial read failure with error code: %d.",
static_cast<int>(error)));
pending_read_buffer_ = nullptr;
- base::ThreadTaskRunnerHandle::Get()->PostTask(
+ base::SequencedTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::Bind(&Listener::OnConnectionOpened,
base::Unretained(listener_), false));
return;
@@ -357,7 +357,7 @@
base::TimeDelta::FromMilliseconds(kFlushQuietPeriodThresholdMs)) {
LogSerial("(flush) Quiet period has finished.");
pending_read_buffer_ = nullptr;
- base::ThreadTaskRunnerHandle::Get()->PostTask(
+ base::SequencedTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::Bind(&Listener::OnConnectionOpened,
base::Unretained(listener_), true));
return;
@@ -367,7 +367,7 @@
// read again after a delay.
LogSerial(StringPrintf("(flush) Reading more bytes after %u ms delay.",
kFlushQuietPeriodThresholdMs));
- base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
+ base::SequencedTaskRunnerHandle::Get()->PostDelayedTask(
FROM_HERE,
base::BindOnce(&BattOrConnectionImpl::BeginReadBytesForFlush,
AsWeakPtr()),
@@ -436,7 +436,7 @@
device::mojom::SerialSendError error) {
bool success = (error == device::mojom::SerialSendError::NONE) &&
(pending_write_length_ == static_cast<size_t>(bytes_sent));
- base::ThreadTaskRunnerHandle::Get()->PostTask(
+ base::SequencedTaskRunnerHandle::Get()->PostTask(
FROM_HERE,
base::Bind(&Listener::OnBytesSent, base::Unretained(listener_), success));
}