Refactor WebBluetoothServiceClient in the web_bluetooth.mojom

third_party/WebKit/public/platform/modules/bluetooth/web_bluetooth.mojom

 // 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.
 
 module blink.mojom;
 
 import "device/bluetooth/public/interfaces/uuid.mojom";
 
 // Bluetooth Terminology:
 //
@@ skipping 138 matching lines @@
 };
 
 struct WebBluetoothRemoteGATTDescriptor {
   string instance_id; // See Instance ID Note above.
   bluetooth.mojom.UUID uuid;
 };
 
 // Web Bluetooth Interface that Blink can use to perform
 // Bluetooth GATT Operations on Bluetooth Devices.
 interface WebBluetoothService {
-  // Sets the client for this WebBluetoothService. The service will notify the
-  // client of device events e.g. when a Characteristic's value changes or when
-  // a device disconnects.
-  SetClient(associated WebBluetoothServiceClient client);
-
   RequestDevice(WebBluetoothRequestDeviceOptions options)
     => (WebBluetoothResult result, WebBluetoothDevice? device);
 
   // Creates a GATT Connection to a Bluetooth Device identified by |device_id|
   // if a connection to the device didn't exist already. If a GATT connection
   // existed already then this function increases the ref count to keep that
   // connection alive.
-  RemoteServerConnect(WebBluetoothDeviceId device_id) => (WebBluetoothResult result);
+  // Returns the result of the connection request and a client request if the
+  // connection was successful and there was no previous WebBluetoothServerClient.
+  RemoteServerConnect(WebBluetoothDeviceId device_id) => (
+    WebBluetoothResult result,
+    associated WebBluetoothServerClient&? client_request);
 
   // If a GATT connection exists for Device identified by |device_id| then
   // decreases the ref count for that connection.
   RemoteServerDisconnect(WebBluetoothDeviceId device_id);
 
   // Returns the Services of a GATT Device identified by |device_id|.
   // If |services_uuid| is present, filters services by |services_uuid|.
   // Otherwise returns all non-blocklisted services.
   // If |quantity| == WebBluetoothGATTQueryQuantity::SINGLE, at most one
   // service will be returned.
@@ skipping 30 matching lines @@
   // Writes a value to the characteristic identified by
   // |characteristic_instance_id|. The callback is run with
   // WebBluetoothResult::SUCCESS if the value was successfully
   // written.
   RemoteCharacteristicWriteValue(
     string characteristic_instance_id,
     array<uint8> value) => (WebBluetoothResult result);
 
   // Starts notifications for the characteristic identified by
   // |characteristic_instance_id|.
+  // Returns the result of the start notifications request and a client
+  // request if the gatt operation was successful and there was no previous
+  // WebBluetoothCharacteristicClient.
   RemoteCharacteristicStartNotifications(
-    string characteristic_instance_id) => (WebBluetoothResult result);
+    string characteristic_instance_id) => (
+      WebBluetoothResult result,
+      associated WebBluetoothCharacteristicClient&? client_request);
 
   // Stops notifications for the characteristic identified by
   // |characteristic_instance_id|.
   RemoteCharacteristicStopNotifications(
     string characteristic_instance_id) => ();
 
   // Returns the Descriptors of a GATT Characteristic identified by
   // |characteristics_instance_id|.
   // If |descriptor_uuid| is present, filters descriptors by
   // |descriptor_uuid|. Otherwise returns all non-blocklisted descriptors.
@@ skipping 18 matching lines @@
 
   // Writes a value to the descriptor identified by
   // |descriptor_instance_id|. The callback is run with
   // WebBluetoothResult::SUCCESS if the value was successfully
   // written.
   RemoteDescriptorWriteValue(
     string descriptor_instance_id,
     array<uint8> value) => (WebBluetoothResult result);
 };
 
-// Classes should implement this interface and pass an associated pointer
-// bound to them to the WebBluetoothService by using SetClient. Classes
-// that do this will be notified of device events e.g. device disconnection.
-interface WebBluetoothServiceClient {
-  // The characteristic identified by |characteristic_instance_id| has received
-  // a notification of value change.
-  RemoteCharacteristicValueChanged(string characteristic_instance_id,
-                                   array<uint8> value);
+// Classes that implement this interface will be notified of characteristic
+// events.
+interface WebBluetoothCharacteristicClient {
+  // Called when we receive a notification for the characteristic.
+  RemoteCharacteristicValueChanged(array<uint8> value);
+};
 
-  // The device identified by |device_id| has been disconnected.
-  GattServerDisconnected(WebBluetoothDeviceId device_id);
+// Classes that implement this interface will be notified of device events.
+interface WebBluetoothServerClient {
+  // Called when a device disconnects.
+  GATTServerDisconnected();
 };