arc: bluetooth: Implement Gatt Server add/delete/start/stop service

components/arc/bluetooth/arc_bluetooth_bridge.h

Index: components/arc/bluetooth/arc_bluetooth_bridge.h
diff --git a/components/arc/bluetooth/arc_bluetooth_bridge.h b/components/arc/bluetooth/arc_bluetooth_bridge.h
index 79d45a52fe720c16e44da13dc17c9d242f7971b8..ef53c79655033861ae7bfa231789d28f274162e2 100644
--- a/components/arc/bluetooth/arc_bluetooth_bridge.h
+++ b/components/arc/bluetooth/arc_bluetooth_bridge.h
@@ -40,6 +40,9 @@ class ArcBluetoothBridge
       public device::BluetoothLocalGattService::Delegate,
       public mojom::BluetoothHost {
  public:
+  using GattStatusCallback = base::Callback<void(mojom::BluetoothGattStatus)>;
+  using GattReadCallback = base::Callback<void(mojom::BluetoothGattValuePtr)>;
+
   explicit ArcBluetoothBridge(ArcBridgeService* bridge_service);
   ~ArcBluetoothBridge() override;
 
@@ -192,10 +195,10 @@ class ArcBluetoothBridge
   void SearchService(mojom::BluetoothAddressPtr remote_addr) override;
 
   int ConvertGattIdentifierToId(const std::string identifier) const;
-  template <class T>
+  template <class RemoteGattObjectT>

[rkc, 2016/07/16 00:37:29]

Gatt Objects are collectively called Attributes. Why do we want to create a term
when one already exists?
Also, the T is redundant. We typically use T in a template typename to denote an
object of any arbitrary type (which is not the case here).

[rkc, 2016/07/18 21:48:16]

Unaddressed?

Please rename "GattObject" and similar names to "Attribute" or similar.

[puthik_chromium, 2016/07/18 22:45:23]

Missed this comment.
Done

   mojom::BluetoothGattDBElementPtr CreateGattDBElement(
       const mojom::BluetoothGattDBAttributeType type,
-      const T* GattObject) const;
+      const RemoteGattObjectT* GattObject) const;
   void GetGattDB(mojom::BluetoothAddressPtr remote_addr) override;
   void ReadGattCharacteristic(
       mojom::BluetoothAddressPtr remote_addr,
@@ -313,28 +316,21 @@ class ArcBluetoothBridge
       const StopLEListenCallback& callback,
       device::BluetoothAdvertisement::ErrorCode error_code);
 
-  using GattReadCallback = base::Callback<void(mojom::BluetoothGattValuePtr)>;
+  void OnGattOperationDone(const GattStatusCallback& callback) const;
+  void OnGattOperationError(
+      const GattStatusCallback& callback,
+      device::BluetoothGattService::GattErrorCode error_code) const;
+
   void OnGattReadDone(const GattReadCallback& callback,
                       const std::vector<uint8_t>& result) const;
   void OnGattReadError(
       const GattReadCallback& callback,
       device::BluetoothGattService::GattErrorCode error_code) const;
 
-  using GattWriteCallback = base::Callback<void(mojom::BluetoothGattStatus)>;
-  void OnGattWriteDone(const GattWriteCallback& callback) const;
-  void OnGattWriteError(
-      const GattWriteCallback& callback,
-      device::BluetoothGattService::GattErrorCode error_code) const;
-
   void OnGattNotifyStartDone(
       const RegisterForGattNotificationCallback& callback,
       const std::string char_string_id,
       std::unique_ptr<device::BluetoothGattNotifySession> notify_session);
-  void OnGattNotifyStartError(
-      const RegisterForGattNotificationCallback& callback,
-      device::BluetoothGattService::GattErrorCode error_code) const;
-  void OnGattNotifyStopDone(
-      const DeregisterForGattNotificationCallback& callback) const;
 
  private:
   mojo::Array<mojom::BluetoothPropertyPtr> GetDeviceProperties(
@@ -349,9 +345,10 @@ class ArcBluetoothBridge
   bool HasBluetoothInstance() const;
   bool CheckBluetoothInstanceVersion(uint32_t version_need) const;
 
-  template <class T>
-  T* FindGattObjectFromUuid(const std::vector<T*> objs,
-                            const device::BluetoothUUID uuid) const;
+  template <class RemoteGattObjectT>
+  RemoteGattObjectT* FindGattObjectFromUuid(
+      const std::vector<RemoteGattObjectT*> objs,
+      const device::BluetoothUUID uuid) const;
   device::BluetoothRemoteGattCharacteristic* FindGattCharacteristic(
       mojom::BluetoothAddressPtr remote_addr,
       mojom::BluetoothGattServiceIDPtr service_id,
@@ -366,6 +363,9 @@ class ArcBluetoothBridge
   // Propagates the list of paired device to Android.
   void SendCachedPairedDevices() const;
 
+  template <class LocalGattObjectT>
+  int32_t CreateGattAttributeHandle(LocalGattObjectT* gatt_obj);
+
   mojo::Binding<mojom::BluetoothHost> binding_;
 
   scoped_refptr<bluez::BluetoothAdapterBlueZ> bluetooth_adapter_;
@@ -373,6 +373,12 @@ class ArcBluetoothBridge
   std::unique_ptr<device::BluetoothDiscoverySession> discovery_session_;
   std::map<std::string, std::unique_ptr<device::BluetoothGattNotifySession>>
       notification_session_;
+  // Map from android int handle to Chrome (BlueZ) string identifier.
+  std::map<int32_t, std::string> gatt_identifier_;
+  // Store last GattCharacteristic added to each GattService for GattServer.
+  std::map<int32_t, int32_t> last_characteristic_;
+  // Running number for handle to give to Android side.
+  int32_t gatt_server_obj_handle = 0;
 
   // WeakPtrFactory to use for callbacks.
   base::WeakPtrFactory<ArcBluetoothBridge> weak_factory_;