Revert of bluetooth: Use WebBluetoothDeviceId instead of string

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/bluetooth_uuid.mojom";
 
 // Errors that can occur during Web Bluetooth execution, which are transformed
 // to a DOMException in Source/modules/bluetooth/BluetoothError.cpp.
@@ skipping 72 matching lines @@
   array<device.mojom.BluetoothUUID> optional_services;
 };
 
 // Indicates if the function will return a single or multiple
 // GATT objects.
 enum WebBluetoothGATTQueryQuantity {
   SINGLE,
   MULTIPLE
 };
 
-struct WebBluetoothDeviceId {
-  string device_id;
-};
-
 struct WebBluetoothDevice {
-  WebBluetoothDeviceId id;
+  string id;
   string name;
   array<string> uuids;
 };
 
 struct WebBluetoothRemoteGATTService {
   string instance_id;
   string uuid;
 };
 
 struct WebBluetoothRemoteGATTCharacteristic {
@@ skipping 10 matching lines @@
   // a device disconnects.
   SetClient(associated WebBluetoothServiceClient client);
 
   RequestDevice(WebBluetoothRequestDeviceOptions options)
     => (WebBluetoothError error, WebBluetoothDevice? device);
 
   // Creates a GATT Connection to a Bluetooth Device with |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) => (WebBluetoothError error);
+  RemoteServerConnect(string device_id) => (WebBluetoothError error);
 
   // If a GATT connection exists for Device with |device_id| then decreases
   // the ref count for that connection.
-  RemoteServerDisconnect(WebBluetoothDeviceId device_id);
+  RemoteServerDisconnect(string device_id);
 
   // If |services_uuid| is present, returns services with |services_uuid|.
   // Otherwise returns all non-blacklisted services.
   // If |quantity| == WebBluetoothGATTQueryQuantity::SINGLE, only one
   // service will be returned.
   RemoteServerGetPrimaryServices(
-    WebBluetoothDeviceId device_id,
+    string device_id,
     WebBluetoothGATTQueryQuantity quantity,
     device.mojom.BluetoothUUID? services_uuid) => (
       WebBluetoothError error,
       array<WebBluetoothRemoteGATTService>? services);
 
   // Returns the Characteristics of a GATT Service with |service_instance_id|.
   // If |quantity| == WebBluetoothGATTQueryQuantity::SINGLE, only one
   // characteristic will be returned.
   RemoteServiceGetCharacteristics(
     string service_instance_id,
@@ skipping 30 matching lines @@
   RemoteCharacteristicStopNotifications(
     string characteristic_instance_id) => ();
 };
 
 // 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 {
   RemoteCharacteristicValueChanged(string characteristic_instance_id,
                                    array<uint8> value);
-  GattServerDisconnected(WebBluetoothDeviceId device_id);
+  GattServerDisconnected(string device_id);
 };