Convert Callbacks to OnceCallbacks in BluetoothDeviceClient.

This will allow us to convert more Callbacks in the bluetooth component
over to OnceCallbacks, which will let us convert Callbacks in content
eventually.

R=reillyg@chromium.org

Bug: 953861
Change-Id: I4b84898c8ffd5ee9e56f881bb2d852ecd60878bc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1572998Reviewed-by: Reilly Grant <reillyg@chromium.org>
Commit-Queue: danakj <danakj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#652242}

device/bluetooth/dbus/bluetooth_device_client.h

@@ -31,21 +31,18 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothDeviceClient : public BluezDBusClient {
 
   // This callback invoked for a successful GetConnInfo API call with the
   // RSSI, TX power, and maximum TX power of the current connection.
-  using ConnInfoCallback = base::Callback<
+  using ConnInfoCallback = base::OnceCallback<
       void(int16_t rssi, int16_t transmit_power, int16_t max_transmit_power)>;
 
   // This callback invoked for a successful GetServiceRecords API call with the
   // currently discovered service records.
-  using ServiceRecordsCallback = base::Callback<void(const ServiceRecordList&)>;
+  using ServiceRecordsCallback =
+      base::OnceCallback<void(const ServiceRecordList&)>;
 
   // The ErrorCallback is used by device methods to indicate failure.
   // It receives two arguments: the name of the error in |error_name| and
   // an optional message in |error_message|.
-  using ErrorCallback = base::Callback<void(const std::string& error_name,
-                                            const std::string& error_message)>;
-  // TODO(danakj): Switch back to using ErrorCallback once it is migrated to a
-  // OnceCallback.
-  using ErrorOnceCallback =
+  using ErrorCallback =
       base::OnceCallback<void(const std::string& error_name,
                               const std::string& error_message)>;
 
@@ -192,73 +189,73 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothDeviceClient : public BluezDBusClient {
   // may be used to connect additional profiles for an already connected device,
   // and succeeds if at least one profile is connected.
   virtual void Connect(const dbus::ObjectPath& object_path,
-                       const base::Closure& callback,
-                       const ErrorCallback& error_callback) = 0;
+                       base::OnceClosure callback,
+                       ErrorCallback error_callback) = 0;
 
   // Disconnects the device with object path |object_path|, terminating
   // the low-level ACL connection and any profiles using it.
   virtual void Disconnect(const dbus::ObjectPath& object_path,
-                          const base::Closure& callback,
-                          const ErrorCallback& error_callback) = 0;
+                          base::OnceClosure callback,
+                          ErrorCallback error_callback) = 0;
 
   // Connects to the profile |uuid| on the device with object path
   // |object_path|, provided that the profile has been registered with a
   // handler on the local device.
   virtual void ConnectProfile(const dbus::ObjectPath& object_path,
                               const std::string& uuid,
-                              const base::Closure& callback,
-                              const ErrorCallback& error_callback) = 0;
+                              base::OnceClosure callback,
+                              ErrorCallback error_callback) = 0;
 
   // Disconnects from the profile |uuid| on the device with object path
   // |object_path|.
   virtual void DisconnectProfile(const dbus::ObjectPath& object_path,
                                  const std::string& uuid,
-                                 const base::Closure& callback,
-                                 const ErrorCallback& error_callback) = 0;
+                                 base::OnceClosure callback,
+                                 ErrorCallback error_callback) = 0;
 
   // Initiates pairing with the device with object path |object_path| and
   // retrieves all SDP records or GATT primary services. An agent must be
   // registered to handle the pairing request.
   virtual void Pair(const dbus::ObjectPath& object_path,
-                    const base::Closure& callback,
-                    const ErrorCallback& error_callback) = 0;
+                    base::OnceClosure callback,
+                    ErrorCallback error_callback) = 0;
 
   // Cancels an in-progress pairing with the device with object path
   // |object_path| initiated by Pair().
   virtual void CancelPairing(const dbus::ObjectPath& object_path,
-                             const base::Closure& callback,
-                             const ErrorCallback& error_callback) = 0;
+                             base::OnceClosure callback,
+                             ErrorCallback error_callback) = 0;
 
   // Returns the RSSI, TX power, and maximum TX power of a connection to the
   // device with object path |object_path|. If the device is not connected, then
   // an error will be returned.
   virtual void GetConnInfo(const dbus::ObjectPath& object_path,
-                           const ConnInfoCallback& callback,
-                           const ErrorCallback& error_callback) = 0;
+                           ConnInfoCallback callback,
+                           ErrorCallback error_callback) = 0;
 
   // Sets the connection parameters (e.g. connection interval) for the device.
   virtual void SetLEConnectionParameters(
       const dbus::ObjectPath& object_path,
       const ConnectionParameters& conn_params,
-      const base::Closure& callback,
-      const ErrorCallback& error_callback) = 0;
+      base::OnceClosure callback,
+      ErrorCallback error_callback) = 0;
 
   // Returns the currently discovered service records for the device with
   // object path |object_path|. If the device is not connected, then an error
   // will be returned.
   virtual void GetServiceRecords(const dbus::ObjectPath& object_path,
-                                 const ServiceRecordsCallback& callback,
-                                 const ErrorCallback& error_callback) = 0;
+                                 ServiceRecordsCallback callback,
+                                 ErrorCallback error_callback) = 0;
 
   // Executes all the privous prepare writes in a reliable write session.
   virtual void ExecuteWrite(const dbus::ObjectPath& object_path,
-                            const base::Closure& callback,
-                            const ErrorCallback& error_callback) = 0;
+                            base::OnceClosure callback,
+                            ErrorCallback error_callback) = 0;
 
   // Aborts all the privous prepare writes in a reliable write session.
   virtual void AbortWrite(const dbus::ObjectPath& object_path,
-                          const base::Closure& callback,
-                          const ErrorCallback& error_callback) = 0;
+                          base::OnceClosure callback,
+                          ErrorCallback error_callback) = 0;
 
   // Creates the instance.
   static BluetoothDeviceClient* Create();

device/bluetooth/dbus/fake_bluetooth_device_client.h

@@ -83,41 +83,41 @@ class DEVICE_BLUETOOTH_EXPORT FakeBluetoothDeviceClient
       const dbus::ObjectPath& adapter_path) override;
   Properties* GetProperties(const dbus::ObjectPath& object_path) override;
   void Connect(const dbus::ObjectPath& object_path,
-               const base::Closure& callback,
-               const ErrorCallback& error_callback) override;
+               base::OnceClosure callback,
+               ErrorCallback error_callback) override;
   void Disconnect(const dbus::ObjectPath& object_path,
-                  const base::Closure& callback,
-                  const ErrorCallback& error_callback) override;
+                  base::OnceClosure callback,
+                  ErrorCallback error_callback) override;
   void ConnectProfile(const dbus::ObjectPath& object_path,
                       const std::string& uuid,
-                      const base::Closure& callback,
-                      const ErrorCallback& error_callback) override;
+                      base::OnceClosure callback,
+                      ErrorCallback error_callback) override;
   void DisconnectProfile(const dbus::ObjectPath& object_path,
                          const std::string& uuid,
-                         const base::Closure& callback,
-                         const ErrorCallback& error_callback) override;
+                         base::OnceClosure callback,
+                         ErrorCallback error_callback) override;
   void Pair(const dbus::ObjectPath& object_path,
-            const base::Closure& callback,
-            const ErrorCallback& error_callback) override;
+            base::OnceClosure callback,
+            ErrorCallback error_callback) override;
   void CancelPairing(const dbus::ObjectPath& object_path,
-                     const base::Closure& callback,
-                     const ErrorCallback& error_callback) override;
+                     base::OnceClosure callback,
+                     ErrorCallback error_callback) override;
   void GetConnInfo(const dbus::ObjectPath& object_path,
-                   const ConnInfoCallback& callback,
-                   const ErrorCallback& error_callback) override;
+                   ConnInfoCallback callback,
+                   ErrorCallback error_callback) override;
   void SetLEConnectionParameters(const dbus::ObjectPath& object_path,
                                  const ConnectionParameters& conn_params,
-                                 const base::Closure& callback,
-                                 const ErrorCallback& error_callback) override;
+                                 base::OnceClosure callback,
+                                 ErrorCallback error_callback) override;
   void GetServiceRecords(const dbus::ObjectPath& object_path,
-                         const ServiceRecordsCallback& callback,
-                         const ErrorCallback& error_callback) override;
+                         ServiceRecordsCallback callback,
+                         ErrorCallback error_callback) override;
   void ExecuteWrite(const dbus::ObjectPath& object_path,
-                    const base::Closure& callback,
-                    const ErrorCallback& error_callback) override;
+                    base::OnceClosure callback,
+                    ErrorCallback error_callback) override;
   void AbortWrite(const dbus::ObjectPath& object_path,
-                  const base::Closure& callback,
-                  const ErrorCallback& error_callback) override;
+                  base::OnceClosure callback,
+                  ErrorCallback error_callback) override;
 
   void SetSimulationIntervalMs(int interval_ms);
 
@@ -156,7 +156,7 @@ class DEVICE_BLUETOOTH_EXPORT FakeBluetoothDeviceClient
   void SimulatePairing(const dbus::ObjectPath& object_path,
                        bool incoming_request,
                        base::OnceClosure callback,
-                       ErrorOnceCallback error_callback);
+                       ErrorCallback error_callback);
 
   // Updates the connection properties of the fake device that will be returned
   // by GetConnInfo.
@@ -309,15 +309,15 @@ class DEVICE_BLUETOOTH_EXPORT FakeBluetoothDeviceClient
 
   void CompleteSimulatedPairing(const dbus::ObjectPath& object_path,
                                 base::OnceClosure callback,
-                                ErrorOnceCallback error_callback);
+                                ErrorCallback error_callback);
   void TimeoutSimulatedPairing(const dbus::ObjectPath& object_path,
-                               ErrorOnceCallback error_callback);
+                               ErrorCallback error_callback);
   void CancelSimulatedPairing(const dbus::ObjectPath& object_path,
-                              ErrorOnceCallback error_callback);
+                              ErrorCallback error_callback);
   void RejectSimulatedPairing(const dbus::ObjectPath& object_path,
-                              ErrorOnceCallback error_callback);
+                              ErrorCallback error_callback);
   void FailSimulatedPairing(const dbus::ObjectPath& object_path,
-                            ErrorOnceCallback error_callback);
+                            ErrorCallback error_callback);
   void AddInputDeviceIfNeeded(const dbus::ObjectPath& object_path,
                               Properties* properties);
 
@@ -327,33 +327,33 @@ class DEVICE_BLUETOOTH_EXPORT FakeBluetoothDeviceClient
 
   void PinCodeCallback(const dbus::ObjectPath& object_path,
                        base::OnceClosure callback,
-                       ErrorOnceCallback error_callback,
+                       ErrorCallback error_callback,
                        BluetoothAgentServiceProvider::Delegate::Status status,
                        const std::string& pincode);
   void PasskeyCallback(const dbus::ObjectPath& object_path,
                        base::OnceClosure callback,
-                       ErrorOnceCallback error_callback,
+                       ErrorCallback error_callback,
                        BluetoothAgentServiceProvider::Delegate::Status status,
                        uint32_t passkey);
   void ConfirmationCallback(
       const dbus::ObjectPath& object_path,
       base::OnceClosure callback,
-      ErrorOnceCallback error_callback,
+      ErrorCallback error_callback,
       BluetoothAgentServiceProvider::Delegate::Status status);
   void SimulateKeypress(uint16_t entered,
                         const dbus::ObjectPath& object_path,
                         base::OnceClosure callback,
-                        ErrorOnceCallback error_callback);
+                        ErrorCallback error_callback);
 
   void ConnectionCallback(
       const dbus::ObjectPath& object_path,
       base::OnceClosure callback,
-      ErrorOnceCallback error_callback,
+      ErrorCallback error_callback,
       BluetoothProfileServiceProvider::Delegate::Status status);
   void DisconnectionCallback(
       const dbus::ObjectPath& object_path,
       base::OnceClosure callback,
-      ErrorOnceCallback error_callback,
+      ErrorCallback error_callback,
       BluetoothProfileServiceProvider::Delegate::Status status);
 
   // List of observers interested in event notifications from us.

services/device/bluetooth/bluetooth_system_unittest.cc

@@ -566,71 +566,71 @@ class DEVICE_BLUETOOTH_EXPORT TestBluetoothDeviceClient
   }
 
   void Connect(const dbus::ObjectPath& object_path,
-               const base::Closure& callback,
-               const ErrorCallback& error_callback) override {
+               base::OnceClosure callback,
+               ErrorCallback error_callback) override {
     NOTIMPLEMENTED();
   }
 
   void Disconnect(const dbus::ObjectPath& object_path,
-                  const base::Closure& callback,
-                  const ErrorCallback& error_callback) override {
+                  base::OnceClosure callback,
+                  ErrorCallback error_callback) override {
     NOTIMPLEMENTED();
   }
 
   void ConnectProfile(const dbus::ObjectPath& object_path,
                       const std::string& uuid,
-                      const base::Closure& callback,
-                      const ErrorCallback& error_callback) override {
+                      base::OnceClosure callback,
+                      ErrorCallback error_callback) override {
     NOTIMPLEMENTED();
   }
 
   void DisconnectProfile(const dbus::ObjectPath& object_path,
                          const std::string& uuid,
-                         const base::Closure& callback,
-                         const ErrorCallback& error_callback) override {
+                         base::OnceClosure callback,
+                         ErrorCallback error_callback) override {
     NOTIMPLEMENTED();
   }
 
   void Pair(const dbus::ObjectPath& object_path,
-            const base::Closure& callback,
-            const ErrorCallback& error_callback) override {
+            base::OnceClosure callback,
+            ErrorCallback error_callback) override {
     NOTIMPLEMENTED();
   }
 
   void CancelPairing(const dbus::ObjectPath& object_path,
-                     const base::Closure& callback,
-                     const ErrorCallback& error_callback) override {
+                     base::OnceClosure callback,
+                     ErrorCallback error_callback) override {
     NOTIMPLEMENTED();
   }
 
   void GetConnInfo(const dbus::ObjectPath& object_path,
-                   const ConnInfoCallback& callback,
-                   const ErrorCallback& error_callback) override {
+                   ConnInfoCallback callback,
+                   ErrorCallback error_callback) override {
     NOTIMPLEMENTED();
   }
 
   void SetLEConnectionParameters(const dbus::ObjectPath& object_path,
                                  const ConnectionParameters& conn_params,
-                                 const base::Closure& callback,
-                                 const ErrorCallback& error_callback) override {
+                                 base::OnceClosure callback,
+                                 ErrorCallback error_callback) override {
     NOTIMPLEMENTED();
   }
 
   void GetServiceRecords(const dbus::ObjectPath& object_path,
-                         const ServiceRecordsCallback& callback,
-                         const ErrorCallback& error_callback) override {
+                         ServiceRecordsCallback callback,
+                         ErrorCallback error_callback) override {
     NOTIMPLEMENTED();
   }
 
   void ExecuteWrite(const dbus::ObjectPath& object_path,
-                    const base::Closure& callback,
-                    const ErrorCallback& error_callback) override {
+                    base::OnceClosure callback,
+                    ErrorCallback error_callback) override {
     NOTIMPLEMENTED();
   }
 
   void AbortWrite(const dbus::ObjectPath& object_path,
-                  const base::Closure& callback,
-                  const ErrorCallback& error_callback) override {
+                  base::OnceClosure callback,
+                  ErrorCallback error_callback) override {
     NOTIMPLEMENTED();
   }