[bluetooth] device.h to BindOnce & OnceCallback

This change converts all of the uses of base::Bind and base::Callback in
device/bluetooth/device.{cc,h} to use the Once version. This is part of
the Chrome Code Health rotation.

Bug: 1007780
Change-Id: Ie1a19a4447c777ab7ecd067da695bda0a2566a6f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1900665Reviewed-by: Reilly Grant <reillyg@chromium.org>
Commit-Queue: Ovidio de Jesús Ruiz-Henríquez <odejesush@chromium.org>
Cr-Commit-Position: refs/heads/master@{#715108}

device/bluetooth/device.cc

@@ -64,10 +64,10 @@ void Device::GattServicesDiscovered(device::BluetoothAdapter* adapter,
     return;
   }
 
-  std::vector<base::Closure> requests;
+  std::vector<base::OnceClosure> requests;
   requests.swap(pending_services_requests_);
-  for (const base::Closure& request : requests) {
-    request.Run();
+  for (base::OnceClosure& request : requests) {
+    std::move(request).Run();
   }
 }
 
@@ -93,9 +93,9 @@ void Device::GetServices(GetServicesCallback callback) {
 
   // pending_services_requests_ is owned by Device, so base::Unretained is
   // safe.
-  pending_services_requests_.push_back(base::Bind(&Device::GetServicesImpl,
-                                                  base::Unretained(this),
-                                                  base::Passed(&callback)));
+  pending_services_requests_.push_back(base::BindOnce(&Device::GetServicesImpl,
+                                                      base::Unretained(this),
+                                                      base::Passed(&callback)));
 }
 
 void Device::GetCharacteristics(const std::string& service_id,
@@ -151,10 +151,10 @@ void Device::ReadValueForCharacteristic(
 
   auto copyable_callback = base::AdaptCallbackForRepeating(std::move(callback));
   characteristic->ReadRemoteCharacteristic(
-      base::Bind(&Device::OnReadRemoteCharacteristic,
-                 weak_ptr_factory_.GetWeakPtr(), copyable_callback),
-      base::Bind(&Device::OnReadRemoteCharacteristicError,
-                 weak_ptr_factory_.GetWeakPtr(), copyable_callback));
+      base::BindOnce(&Device::OnReadRemoteCharacteristic,
+                     weak_ptr_factory_.GetWeakPtr(), copyable_callback),
+      base::BindOnce(&Device::OnReadRemoteCharacteristicError,
+                     weak_ptr_factory_.GetWeakPtr(), copyable_callback));
 }
 
 void Device::WriteValueForCharacteristic(
@@ -182,10 +182,10 @@ void Device::WriteValueForCharacteristic(
   auto copyable_callback = base::AdaptCallbackForRepeating(std::move(callback));
   characteristic->WriteRemoteCharacteristic(
       value,
-      base::Bind(&Device::OnWriteRemoteCharacteristic,
-                 weak_ptr_factory_.GetWeakPtr(), copyable_callback),
-      base::Bind(&Device::OnWriteRemoteCharacteristicError,
-                 weak_ptr_factory_.GetWeakPtr(), copyable_callback));
+      base::BindOnce(&Device::OnWriteRemoteCharacteristic,
+                     weak_ptr_factory_.GetWeakPtr(), copyable_callback),
+      base::BindOnce(&Device::OnWriteRemoteCharacteristicError,
+                     weak_ptr_factory_.GetWeakPtr(), copyable_callback));
 }
 
 void Device::GetDescriptors(const std::string& service_id,
@@ -259,10 +259,10 @@ void Device::ReadValueForDescriptor(const std::string& service_id,
 
   auto copyable_callback = base::AdaptCallbackForRepeating(std::move(callback));
   descriptor->ReadRemoteDescriptor(
-      base::Bind(&Device::OnReadRemoteDescriptor,
-                 weak_ptr_factory_.GetWeakPtr(), copyable_callback),
-      base::Bind(&Device::OnReadRemoteDescriptorError,
-                 weak_ptr_factory_.GetWeakPtr(), copyable_callback));
+      base::BindOnce(&Device::OnReadRemoteDescriptor,
+                     weak_ptr_factory_.GetWeakPtr(), copyable_callback),
+      base::BindOnce(&Device::OnReadRemoteDescriptorError,
+                     weak_ptr_factory_.GetWeakPtr(), copyable_callback));
 }
 
 void Device::WriteValueForDescriptor(const std::string& service_id,
@@ -297,10 +297,10 @@ void Device::WriteValueForDescriptor(const std::string& service_id,
   auto copyable_callback = base::AdaptCallbackForRepeating(std::move(callback));
   descriptor->WriteRemoteDescriptor(
       value,
-      base::Bind(&Device::OnWriteRemoteDescriptor,
-                 weak_ptr_factory_.GetWeakPtr(), copyable_callback),
-      base::Bind(&Device::OnWriteRemoteDescriptorError,
-                 weak_ptr_factory_.GetWeakPtr(), copyable_callback));
+      base::BindOnce(&Device::OnWriteRemoteDescriptor,
+                     weak_ptr_factory_.GetWeakPtr(), copyable_callback),
+      base::BindOnce(&Device::OnWriteRemoteDescriptorError,
+                     weak_ptr_factory_.GetWeakPtr(), copyable_callback));
 }
 
 Device::Device(scoped_refptr<device::BluetoothAdapter> adapter,

device/bluetooth/device.h

@@ -126,7 +126,7 @@ class Device : public mojom::Device, public device::BluetoothAdapter::Observer {
 
   // The services request queue which holds callbacks that are waiting for
   // services to be discovered for this device.
-  std::vector<base::Closure> pending_services_requests_;
+  std::vector<base::OnceClosure> pending_services_requests_;
 
   base::WeakPtrFactory<Device> weak_ptr_factory_{this};