Commit d2033cf9 authored by Leonard Grey's avatar Leonard Grey Committed by Chromium LUCI CQ

[Code health] Convert AndroidUsbSocket delete callback to OnceClosure

Bug: 1152274
Change-Id: I179c720aa3b384c243cf61c3186fae17f8acfc59
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2585691Reviewed-by: default avatarAndrey Kosyakov <caseq@chromium.org>
Commit-Queue: Leonard Grey <lgrey@chromium.org>
Cr-Commit-Position: refs/heads/master@{#836798}
parent 88b87a96
...@@ -233,7 +233,7 @@ net::StreamSocket* AndroidUsbDevice::CreateSocket(const std::string& command) { ...@@ -233,7 +233,7 @@ net::StreamSocket* AndroidUsbDevice::CreateSocket(const std::string& command) {
uint32_t socket_id = ++last_socket_id_; uint32_t socket_id = ++last_socket_id_;
sockets_[socket_id] = new AndroidUsbSocket( sockets_[socket_id] = new AndroidUsbSocket(
this, socket_id, command, this, socket_id, command,
base::Bind(&AndroidUsbDevice::SocketDeleted, this, socket_id)); base::BindOnce(&AndroidUsbDevice::SocketDeleted, this, socket_id));
return sockets_[socket_id]; return sockets_[socket_id];
} }
......
...@@ -23,20 +23,20 @@ const int kMaxPayload = 4096; ...@@ -23,20 +23,20 @@ const int kMaxPayload = 4096;
AndroidUsbSocket::AndroidUsbSocket(scoped_refptr<AndroidUsbDevice> device, AndroidUsbSocket::AndroidUsbSocket(scoped_refptr<AndroidUsbDevice> device,
uint32_t socket_id, uint32_t socket_id,
const std::string& command, const std::string& command,
base::Closure delete_callback) base::OnceClosure delete_callback)
: device_(device), : device_(device),
command_(command), command_(command),
local_id_(socket_id), local_id_(socket_id),
remote_id_(0), remote_id_(0),
is_connected_(false), is_connected_(false),
delete_callback_(delete_callback) {} delete_callback_(std::move(delete_callback)) {}
AndroidUsbSocket::~AndroidUsbSocket() { AndroidUsbSocket::~AndroidUsbSocket() {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
if (is_connected_) if (is_connected_)
Disconnect(); Disconnect();
if (!delete_callback_.is_null()) if (!delete_callback_.is_null())
delete_callback_.Run(); std::move(delete_callback_).Run();
} }
void AndroidUsbSocket::HandleIncoming(std::unique_ptr<AdbMessage> message) { void AndroidUsbSocket::HandleIncoming(std::unique_ptr<AdbMessage> message) {
......
...@@ -24,7 +24,7 @@ class AndroidUsbSocket : public net::StreamSocket { ...@@ -24,7 +24,7 @@ class AndroidUsbSocket : public net::StreamSocket {
AndroidUsbSocket(scoped_refptr<AndroidUsbDevice> device, AndroidUsbSocket(scoped_refptr<AndroidUsbDevice> device,
uint32_t socket_id, uint32_t socket_id,
const std::string& command, const std::string& command,
base::Closure delete_callback); base::OnceClosure delete_callback);
~AndroidUsbSocket() override; ~AndroidUsbSocket() override;
void HandleIncoming(std::unique_ptr<AdbMessage> message); void HandleIncoming(std::unique_ptr<AdbMessage> message);
...@@ -77,7 +77,7 @@ class AndroidUsbSocket : public net::StreamSocket { ...@@ -77,7 +77,7 @@ class AndroidUsbSocket : public net::StreamSocket {
net::CompletionOnceCallback connect_callback_; net::CompletionOnceCallback connect_callback_;
net::CompletionOnceCallback read_callback_; net::CompletionOnceCallback read_callback_;
net::CompletionOnceCallback write_callback_; net::CompletionOnceCallback write_callback_;
base::Closure delete_callback_; base::OnceClosure delete_callback_;
SEQUENCE_CHECKER(sequence_checker_); SEQUENCE_CHECKER(sequence_checker_);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment