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

[Code health] Convert AndroidUsbDevicesCallback to OnceCallback

Bug: 1152274
Change-Id: If300d7e0fd0c39d56d4918ba0a414d93b88b7c78
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2587375Reviewed-by: default avatarAndrey Kosyakov <caseq@chromium.org>
Commit-Queue: Leonard Grey <lgrey@chromium.org>
Cr-Commit-Position: refs/heads/master@{#836737}
parent 84eaf128
...@@ -84,7 +84,7 @@ void DumpMessage(bool outgoing, const uint8_t* data, size_t length) { ...@@ -84,7 +84,7 @@ void DumpMessage(bool outgoing, const uint8_t* data, size_t length) {
#endif // 0 #endif // 0
} }
void OnProbeFinished(const AndroidUsbDevicesCallback& callback, void OnProbeFinished(AndroidUsbDevicesCallback callback,
AndroidUsbDevices* new_devices) { AndroidUsbDevices* new_devices) {
std::unique_ptr<AndroidUsbDevices> devices(new_devices); std::unique_ptr<AndroidUsbDevices> devices(new_devices);
...@@ -95,7 +95,7 @@ void OnProbeFinished(const AndroidUsbDevicesCallback& callback, ...@@ -95,7 +95,7 @@ void OnProbeFinished(const AndroidUsbDevicesCallback& callback,
// Return all claimed devices. // Return all claimed devices.
AndroidUsbDevices result(g_devices.Get().begin(), g_devices.Get().end()); AndroidUsbDevices result(g_devices.Get().begin(), g_devices.Get().end());
callback.Run(result); std::move(callback).Run(result);
} }
void OnDeviceClosed(const std::string& guid, void OnDeviceClosed(const std::string& guid,
...@@ -159,13 +159,13 @@ void OnDeviceOpened(AndroidUsbDevices* devices, ...@@ -159,13 +159,13 @@ void OnDeviceOpened(AndroidUsbDevices* devices,
} }
void OpenAndroidDevices(crypto::RSAPrivateKey* rsa_key, void OpenAndroidDevices(crypto::RSAPrivateKey* rsa_key,
const AndroidUsbDevicesCallback& callback, AndroidUsbDevicesCallback callback,
std::vector<AndroidDeviceInfo> device_info_list) { std::vector<AndroidDeviceInfo> device_info_list) {
// Add new devices. // Add new devices.
AndroidUsbDevices* devices = new AndroidUsbDevices(); AndroidUsbDevices* devices = new AndroidUsbDevices();
base::RepeatingClosure barrier = base::RepeatingClosure barrier = base::BarrierClosure(
base::BarrierClosure(device_info_list.size(), device_info_list.size(),
base::BindOnce(&OnProbeFinished, callback, devices)); base::BindOnce(&OnProbeFinished, std::move(callback), devices));
for (const auto& device_info : device_info_list) { for (const auto& device_info : device_info_list) {
if (base::Contains(g_open_devices.Get(), device_info.guid)) { if (base::Contains(g_open_devices.Get(), device_info.guid)) {
...@@ -197,9 +197,9 @@ AdbMessage::~AdbMessage() {} ...@@ -197,9 +197,9 @@ AdbMessage::~AdbMessage() {}
// static // static
void AndroidUsbDevice::Enumerate(crypto::RSAPrivateKey* rsa_key, void AndroidUsbDevice::Enumerate(crypto::RSAPrivateKey* rsa_key,
const AndroidUsbDevicesCallback& callback) { AndroidUsbDevicesCallback callback) {
UsbDeviceManagerHelper::GetInstance()->GetAndroidDevices( UsbDeviceManagerHelper::GetInstance()->GetAndroidDevices(
base::BindOnce(&OpenAndroidDevices, rsa_key, callback)); base::BindOnce(&OpenAndroidDevices, rsa_key, std::move(callback)));
} }
AndroidUsbDevice::AndroidUsbDevice( AndroidUsbDevice::AndroidUsbDevice(
......
...@@ -71,13 +71,13 @@ class AdbMessage { ...@@ -71,13 +71,13 @@ class AdbMessage {
class AndroidUsbDevice; class AndroidUsbDevice;
typedef std::vector<scoped_refptr<AndroidUsbDevice> > AndroidUsbDevices; typedef std::vector<scoped_refptr<AndroidUsbDevice> > AndroidUsbDevices;
typedef base::Callback<void(const AndroidUsbDevices&)> typedef base::OnceCallback<void(const AndroidUsbDevices&)>
AndroidUsbDevicesCallback; AndroidUsbDevicesCallback;
class AndroidUsbDevice : public base::RefCountedThreadSafe<AndroidUsbDevice> { class AndroidUsbDevice : public base::RefCountedThreadSafe<AndroidUsbDevice> {
public: public:
static void Enumerate(crypto::RSAPrivateKey* rsa_key, static void Enumerate(crypto::RSAPrivateKey* rsa_key,
const AndroidUsbDevicesCallback& callback); AndroidUsbDevicesCallback callback);
AndroidUsbDevice(crypto::RSAPrivateKey* rsa_key, AndroidUsbDevice(crypto::RSAPrivateKey* rsa_key,
const AndroidDeviceInfo& android_device_info, const AndroidDeviceInfo& android_device_info,
......
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