Implement WebBluetooth getDescriptor[s]

content/renderer/bluetooth/web_bluetooth_impl.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 CONTENT_RENDERER_BLUETOOTH_WEB_BLUETOOTH_IMPL_H_
 #define CONTENT_RENDERER_BLUETOOTH_WEB_BLUETOOTH_IMPL_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 46 matching lines @@
       int32_t quantity /* Corresponds to WebBluetoothGATTQueryQuantity in
                         web_bluetooth.mojom */,
       const blink::WebString& services_uuid,
       blink::WebBluetoothGetPrimaryServicesCallbacks* callbacks) override;
   void getCharacteristics(
       const blink::WebString& service_instance_id,
       int32_t quantity /* Corresponds to WebBluetoothGATTQueryQuantity in
                         web_bluetooth.mojom */,
       const blink::WebString& characteristics_uuid,
       blink::WebBluetoothGetCharacteristicsCallbacks* callbacks) override;
-  void readValue(const blink::WebString& characteristic_instance_id,
-                 blink::WebBluetoothReadValueCallbacks* callbacks) override;
-  void writeValue(const blink::WebString& characteristic_instance_id,
-                  const blink::WebVector<uint8_t>& value,
-                  blink::WebBluetoothWriteValueCallbacks*) override;
+  void characteristicReadValue(
+      const blink::WebString& characteristic_instance_id,
+      blink::WebBluetoothReadValueCallbacks* callbacks) override;
+  void characteristicWriteValue(
+      const blink::WebString& characteristic_instance_id,
+      const blink::WebVector<uint8_t>& value,
+      blink::WebBluetoothWriteValueCallbacks*) override;
   void startNotifications(
       const blink::WebString& characteristic_instance_id,
       blink::WebBluetoothNotificationsCallbacks*) override;
   void stopNotifications(
       const blink::WebString& characteristic_instance_id,
       blink::WebBluetoothNotificationsCallbacks*) override;
   void characteristicObjectRemoved(
       const blink::WebString& characteristic_instance_id,
       blink::WebBluetoothRemoteGATTCharacteristic* characteristic) override;
   void registerCharacteristicObject(
       const blink::WebString& characteristic_instance_id,
       blink::WebBluetoothRemoteGATTCharacteristic* characteristic) override;
+  void getDescriptors(
+      const blink::WebString& characteristic_instance_id,
+      int32_t quantity /* Corresponds to WebBluetoothGATTQueryQuantity in
+                        web_bluetooth.mojom */,
+      const blink::WebString& descriptor_uuid,
+      blink::WebBluetoothGetDescriptorsCallbacks* callbacks) override;
+  void descriptorReadValue(

[ortuno, 2016/12/02 06:14:50]

No need for these since we don't implement it yet.

[dougt, 2016/12/02 18:31:28]

Done.

+      const blink::WebString& descriptor_instance_id,
+      blink::WebBluetoothReadValueCallbacks* callbacks) override;
+  void descriptorWriteValue(const blink::WebString& descriptor_instance_id,
+                            const blink::WebVector<uint8_t>& value,
+                            blink::WebBluetoothWriteValueCallbacks*) override;
 
  private:
   struct GetCharacteristicsCallback;
   // WebBluetoothServiceClient methods:
   void RemoteCharacteristicValueChanged(
       const std::string& characteristic_instance_id,
       const std::vector<uint8_t>& value) override;
+
   void GattServerDisconnected(const WebBluetoothDeviceId& device_id) override;
 
   // Callbacks for WebBluetoothService calls:
   void OnRequestDeviceComplete(
       std::unique_ptr<blink::WebBluetoothRequestDeviceCallbacks> callbacks,
       const blink::mojom::WebBluetoothResult result,
       blink::mojom::WebBluetoothDevicePtr device);
   void OnConnectComplete(
       std::unique_ptr<blink::WebBluetoothRemoteGATTServerConnectCallbacks>
           callbacks,
       blink::mojom::WebBluetoothResult result);
   void OnGetPrimaryServicesComplete(
       const blink::WebString& device_id,
       std::unique_ptr<blink::WebBluetoothGetPrimaryServicesCallbacks> callbacks,
       blink::mojom::WebBluetoothResult result,
       base::Optional<
           std::vector<blink::mojom::WebBluetoothRemoteGATTServicePtr>>
           services);
   void OnGetCharacteristicsComplete(
-      const blink::WebString& service_instance_id,
+      const blink::WebString& characteristic_instance_id,

[ortuno, 2016/12/02 06:14:50]

I think it was correct before i.e. service_instance_id.

[dougt, 2016/12/02 18:31:28]

Done.

       std::unique_ptr<blink::WebBluetoothGetCharacteristicsCallbacks> callbacks,
       blink::mojom::WebBluetoothResult result,
       base::Optional<
           std::vector<blink::mojom::WebBluetoothRemoteGATTCharacteristicPtr>>
           characteristics);
   void OnReadValueComplete(
       std::unique_ptr<blink::WebBluetoothReadValueCallbacks> callbacks,
       blink::mojom::WebBluetoothResult result,
       const base::Optional<std::vector<uint8_t>>& value);
   void OnWriteValueComplete(
       const blink::WebVector<uint8_t>& value,
       std::unique_ptr<blink::WebBluetoothWriteValueCallbacks> callbacks,
       blink::mojom::WebBluetoothResult result);
   void OnStartNotificationsComplete(
       std::unique_ptr<blink::WebBluetoothNotificationsCallbacks> callbacks,
       blink::mojom::WebBluetoothResult result);
   void OnStopNotificationsComplete(
       std::unique_ptr<blink::WebBluetoothNotificationsCallbacks> callbacks);
-
+  void OnGetDescriptorsComplete(
+      const blink::WebString& service_instance_id,
+      std::unique_ptr<blink::WebBluetoothGetDescriptorsCallbacks> callbacks,
+      blink::mojom::WebBluetoothResult result,
+      base::Optional<
+          std::vector<blink::mojom::WebBluetoothRemoteGATTDescriptorPtr>>
+          descriptors);
   void DispatchCharacteristicValueChanged(
       const std::string& characteristic_instance_id,
       const std::vector<uint8_t>& value);
 
   blink::mojom::WebBluetoothService& GetWebBluetoothService();
   service_manager::InterfaceProvider* const remote_interfaces_;
   blink::mojom::WebBluetoothServicePtr web_bluetooth_service_;
 
   // Map of characteristic_instance_ids to
   // WebBluetoothRemoteGATTCharacteristics. When characteristicObjectRemoved is
@@ skipping 12 matching lines @@
 
   // Binding associated with |web_bluetooth_service_|.
   mojo::AssociatedBinding<blink::mojom::WebBluetoothServiceClient> binding_;
 
   DISALLOW_COPY_AND_ASSIGN(WebBluetoothImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_BLUETOOTH_WEB_BLUETOOTH_IMPL_H_