Bluetooth class changes for implementing local GATT attributes.

device/bluetooth/bluetooth_local_gatt_service.h

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef DEVICE_BLUETOOTH_BLUETOOTH_LOCAL_GATT_SERVICE_H_
 #define DEVICE_BLUETOOTH_BLUETOOTH_LOCAL_GATT_SERVICE_H_
 
 #include <stdint.h>
 #include <vector>
 
@@ skipping 26 matching lines @@
 // their gatt service class, hence causing an inheritance diamond.
 class DEVICE_BLUETOOTH_EXPORT BluetoothLocalGattService
     : public virtual BluetoothGattService {
  public:
   // The Delegate class is used to send certain events that need to be handled
   // when the device is in peripheral mode. The delegate handles read and write
   // requests that are issued from remote clients.
   class Delegate {
    public:
     // Callbacks used for communicating GATT request responses.
-    typedef base::Callback<void(const std::vector<uint8_t>)> ValueCallback;
+    typedef base::Callback<void(const std::vector<uint8_t>&)> ValueCallback;
     typedef base::Closure ErrorCallback;
 
     // Called when a remote device in the central role requests to read the
     // value of the characteristic |characteristic| starting at offset |offset|.
     // This method is only called if the characteristic was specified as
     // readable and any authentication and authorization challenges were
     // satisfied by the remote device.
     //
     // To respond to the request with success and return the requested value,
     // the delegate must invoke |callback| with the value. Doing so will
     // automatically update the value property of |characteristic|. To respond
     // to the request with failure (e.g. if an invalid offset was given),
     // delegates must invoke |error_callback|. If neither callback parameter is
     // invoked, the request will time out and result in an error. Therefore,
     // delegates MUST invoke either |callback| or |error_callback|.
     virtual void OnCharacteristicReadRequest(
         const BluetoothLocalGattService* service,
         const BluetoothLocalGattCharacteristic* characteristic,
         int offset,
         const ValueCallback& callback,
         const ErrorCallback& error_callback) = 0;
 
     // Called when a remote device in the central role requests to write the
     // value of the characteristic |characteristic| starting at offset |offset|.
     // This method is only called if the characteristic was specified as
     // writable and any authentication and authorization challenges were
     // satisfied by the remote device.
     //
     // To respond to the request with success the delegate must invoke
     // |callback| with the new value of the characteristic. Doing so will

[scheib, 2016/04/28 01:06:24]

You've changed the callback to Closure instead of ValueCallback. I don't see
why, but if it was intended then the comments need to be updated. In the later
patches the tests are using ValueCallback.

[rkc, 2016/04/28 02:06:57]

Fixed the comments. Nothing should be using ValueCallback here, the code won't
compile. I looked but all write delegate functions seem to be using a closure.

If you see any further code using a ValueCallback for write functions, please do
let me know. That needs to change.

     // automatically update the value property of |characteristic|. To respond
     // to the request with failure (e.g. if an invalid offset was given),
     // delegates must invoke |error_callback|. If neither callback parameter is
     // invoked, the request will time out and result in an error. Therefore,
     // delegates MUST invoke either |callback| or |error_callback|.
     virtual void OnCharacteristicWriteRequest(
         const BluetoothLocalGattService* service,
         const BluetoothLocalGattCharacteristic* characteristic,
         const std::vector<uint8_t>& value,
         int offset,
-        const ValueCallback& callback,
+        const base::Closure& callback,
         const ErrorCallback& error_callback) = 0;
 
     // Called when a remote device in the central role requests to read the
     // value of the descriptor |descriptor| starting at offset |offset|.
     // This method is only called if the characteristic was specified as
     // readable and any authentication and authorization challenges were
     // satisfied by the remote device.
     //
     // To respond to the request with success and return the requested value,
     // the delegate must invoke |callback| with the value. Doing so will
@@ skipping 20 matching lines @@
     // automatically update the value property of |descriptor|. To respond
     // to the request with failure (e.g. if an invalid offset was given),
     // delegates must invoke |error_callback|. If neither callback parameter is
     // invoked, the request will time out and result in an error. Therefore,
     // delegates MUST invoke either |callback| or |error_callback|.
     virtual void OnDescriptorWriteRequest(
         const BluetoothLocalGattService* service,
         const BluetoothLocalGattDescriptor* descriptor,
         const std::vector<uint8_t>& value,
         int offset,
-        const ValueCallback& callback,
+        const base::Closure& callback,
         const ErrorCallback& error_callback) = 0;
   };
 
   // Creates a local GATT service to be used with |adapter| (which will own
   // the created service object).  A service can register or unregister itself
   // at any time by calling its Register/Unregister methods. |delegate|
   // receives read/write requests for characteristic/descriptor values. It
   // needs to outlive this object.
   // TODO(rkc): Implement included services.
   static base::WeakPtr<BluetoothLocalGattService> Create(
@@ skipping 18 matching lines @@
   BluetoothLocalGattService();
   ~BluetoothLocalGattService() override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(BluetoothLocalGattService);
 };
 
 }  // namespace device
 
 #endif  // DEVICE_BLUETOOTH_BLUETOOTH_LOCAL_GATT_SERVICE_H_