Revert of bluetooth: Use WebBluetoothDeviceId instead of string

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

Index: third_party/WebKit/public/platform/modules/bluetooth/web_bluetooth.mojom
diff --git a/third_party/WebKit/public/platform/modules/bluetooth/web_bluetooth.mojom b/third_party/WebKit/public/platform/modules/bluetooth/web_bluetooth.mojom
index 4e60e78ca09e452abe3f2da7a85ae34de0c82ad3..279384e66a5eeb09df240ddd8e9f99d50dcfe23d 100644
--- a/third_party/WebKit/public/platform/modules/bluetooth/web_bluetooth.mojom
+++ b/third_party/WebKit/public/platform/modules/bluetooth/web_bluetooth.mojom
@@ -90,12 +90,8 @@
   MULTIPLE
 };
 
-struct WebBluetoothDeviceId {
-  string device_id;
-};
-
 struct WebBluetoothDevice {
-  WebBluetoothDeviceId id;
+  string id;
   string name;
   array<string> uuids;
 };
@@ -126,18 +122,18 @@
   // 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,
@@ -188,5 +184,5 @@
 interface WebBluetoothServiceClient {
   RemoteCharacteristicValueChanged(string characteristic_instance_id,
                                    array<uint8> value);
-  GattServerDisconnected(WebBluetoothDeviceId device_id);
+  GattServerDisconnected(string device_id);
 };