Add support for local services/characteristics/descriptors.

device/bluetooth/bluetooth_gatt_service.h

 // Copyright 2014 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_GATT_SERVICE_H_
 #define DEVICE_BLUETOOTH_BLUETOOTH_GATT_SERVICE_H_
 
 #include <stdint.h>
 
+#include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "device/bluetooth/bluetooth_export.h"
 #include "device/bluetooth/bluetooth_uuid.h"
 
 namespace device {
 
 class BluetoothDevice;
@@ skipping 115 matching lines @@
     GATT_ERROR_FAILED,
     GATT_ERROR_IN_PROGRESS,
     GATT_ERROR_INVALID_LENGTH,
     GATT_ERROR_NOT_PERMITTED,
     GATT_ERROR_NOT_AUTHORIZED,
     GATT_ERROR_NOT_PAIRED,
     GATT_ERROR_NOT_SUPPORTED
   };
 
   // The ErrorCallback is used by methods to asynchronously report errors.
-  typedef base::Closure ErrorCallback;
+  using ErrorCallback = base::Callback<void(GattErrorCode error_code)>;
 
   virtual ~BluetoothGattService();
 
   // Constructs a BluetoothGattService that can be locally hosted when the local
   // adapter is in the peripheral role. The resulting object can then be made
   // available by calling the "Register" method. This method constructs a
   // service with UUID |uuid|. Whether the constructed service is primary or
   // secondary is determined by |is_primary|. |delegate| is used to send certain
   // peripheral role events. If |delegate| is NULL, then this service will
   // employ a default behavior when responding to read and write requests based
@@ skipping 52 matching lines @@
 
   // Registers this GATT service. Calling Register will make this service and
   // all of its associated attributes available on the local adapters GATT
   // database and the service UUID will be advertised to nearby devices if the
   // local adapter is discoverable. Call Unregister to make this service no
   // longer available.
   //
   // These methods only make sense for services that are local and will hence
   // fail if this instance represents a remote GATT service. |callback| is
   // called to denote success and |error_callback| to denote failure.
   virtual void Register(const base::Closure& callback,

[ortuno, 2016/04/14 17:42:35]

I thought these were going to be moved to the adapter?

[rkc, 2016/04/14 19:27:27]

All in good time. This is a refactor. The purpose is to try to move code around
and only change what really needs to be.

                         const ErrorCallback& error_callback) = 0;
   virtual void Unregister(const base::Closure& callback,
                           const ErrorCallback& error_callback) = 0;
 
  protected:
   BluetoothGattService();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(BluetoothGattService);
 };
 
 }  // namespace device
 
 #endif  // DEVICE_BLUETOOTH_BLUETOOTH_GATT_SERVICE_H_