Merge to release branch: Revert "Instrument the UUID properties of BluetoothRemoteGATT interfaces for the"
This reverts commit 5f6a15dfe64ea9265b0624fcc494c13351618e2f.
Reason for revert: This API does not appear to have high usage, so is
unlikely to give us much data for the Identifiability Study. This
instrumentation will, however, make it less likely for us to select
other APIs (from which to collect data) on a given client.
(cherry picked from commit 2b39bbccf938ddc30807dc5ba4515683f14279ed)
Bug: 973801, 1137831
Change-Id: I7c6b07c168dec642b8110297b605cb17091e2a1e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2464002
Reviewed-by: Asanka Herath <[email protected]>
Reviewed-by: Reilly Grant <[email protected]>
Commit-Queue: Chris Fredrickson <[email protected]>
Cr-Original-Commit-Position: refs/heads/master@{#815832}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2475933
Commit-Queue: Reilly Grant <[email protected]>
Auto-Submit: Chris Fredrickson <[email protected]>
Cr-Commit-Position: refs/branch-heads/4280@{#537}
Cr-Branched-From: ea420fb963f9658c9969b6513c56b8f47efa1a2a-refs/heads/master@{#812852}
diff --git a/third_party/blink/public/mojom/web_feature/web_feature.mojom b/third_party/blink/public/mojom/web_feature/web_feature.mojom
index 4ecb64e9..5d6dec3 100644
--- a/third_party/blink/public/mojom/web_feature/web_feature.mojom
+++ b/third_party/blink/public/mojom/web_feature/web_feature.mojom
@@ -2725,9 +2725,9 @@
kMediaRecorder_MimeType = 3399,
kMediaRecorder_VideoBitsPerSecond = 3400,
kMediaRecorder_AudioBitsPerSecond = 3401,
- kBluetoothRemoteGATTCharacteristic_Uuid = 3402,
- kBluetoothRemoteGATTDescriptor_Uuid = 3403,
- kBluetoothRemoteGATTService_Uuid = 3404,
+ kOBSOLETE_BluetoothRemoteGATTCharacteristic_Uuid = 3402,
+ kOBSOLETE_BluetoothRemoteGATTDescriptor_Uuid = 3403,
+ kOBSOLETE_BluetoothRemoteGATTService_Uuid = 3404,
kGPUAdapter_Name = 3405,
kWindowScreenInternal = 3406,
kWindowScreenPrimary = 3407,
diff --git a/third_party/blink/renderer/modules/bluetooth/bluetooth_remote_gatt_characteristic.idl b/third_party/blink/renderer/modules/bluetooth/bluetooth_remote_gatt_characteristic.idl
index edb467dc..da8d2fa 100644
--- a/third_party/blink/renderer/modules/bluetooth/bluetooth_remote_gatt_characteristic.idl
+++ b/third_party/blink/renderer/modules/bluetooth/bluetooth_remote_gatt_characteristic.idl
@@ -11,7 +11,7 @@
SecureContext
] interface BluetoothRemoteGATTCharacteristic : EventTarget {
[SameObject] readonly attribute BluetoothRemoteGATTService service;
- [HighEntropy=Direct, MeasureAs=BluetoothRemoteGATTCharacteristic_Uuid] readonly attribute UUID uuid;
+ readonly attribute UUID uuid;
readonly attribute BluetoothCharacteristicProperties properties;
readonly attribute DataView? value;
[RaisesException, CallWith=ScriptState, MeasureAs=WebBluetoothRemoteCharacteristicGetDescriptor] Promise<BluetoothRemoteGATTDescriptor> getDescriptor(BluetoothDescriptorUUID descriptor);
diff --git a/third_party/blink/renderer/modules/bluetooth/bluetooth_remote_gatt_descriptor.idl b/third_party/blink/renderer/modules/bluetooth/bluetooth_remote_gatt_descriptor.idl
index f6ad62c..8d5faa4 100644
--- a/third_party/blink/renderer/modules/bluetooth/bluetooth_remote_gatt_descriptor.idl
+++ b/third_party/blink/renderer/modules/bluetooth/bluetooth_remote_gatt_descriptor.idl
@@ -12,7 +12,7 @@
SecureContext
] interface BluetoothRemoteGATTDescriptor {
[SameObject] readonly attribute BluetoothRemoteGATTCharacteristic characteristic;
- [HighEntropy=Direct, MeasureAs=BluetoothRemoteGATTDescriptor_Uuid] readonly attribute UUID uuid;
+ readonly attribute UUID uuid;
readonly attribute DataView? value;
[CallWith=ScriptState, RaisesException, MeasureAs=WebBluetoothRemoteDescriptorReadValue] Promise<DataView> readValue();
[CallWith=ScriptState, RaisesException, MeasureAs=WebBluetoothRemoteDescriptorWriteValue] Promise<void> writeValue(BufferSource value);
diff --git a/third_party/blink/renderer/modules/bluetooth/bluetooth_remote_gatt_service.idl b/third_party/blink/renderer/modules/bluetooth/bluetooth_remote_gatt_service.idl
index 1cddb9a..62de0fa 100644
--- a/third_party/blink/renderer/modules/bluetooth/bluetooth_remote_gatt_service.idl
+++ b/third_party/blink/renderer/modules/bluetooth/bluetooth_remote_gatt_service.idl
@@ -10,7 +10,7 @@
SecureContext
] interface BluetoothRemoteGATTService {
[SameObject] readonly attribute BluetoothDevice device;
- [HighEntropy=Direct, MeasureAs=BluetoothRemoteGATTService_Uuid] readonly attribute UUID uuid;
+ readonly attribute UUID uuid;
readonly attribute boolean isPrimary;
[RaisesException, CallWith=ScriptState, MeasureAs=WebBluetoothRemoteServiceGetCharacteristic] Promise<BluetoothRemoteGATTCharacteristic> getCharacteristic(BluetoothCharacteristicUUID characteristic);
[RaisesException, CallWith=ScriptState, MeasureAs=WebBluetoothRemoteServiceGetCharacteristics] Promise<sequence<BluetoothRemoteGATTCharacteristic>> getCharacteristics(optional BluetoothCharacteristicUUID characteristic);
diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml
index f6ab847..6a7009c7 100644
--- a/tools/metrics/histograms/enums.xml
+++ b/tools/metrics/histograms/enums.xml
@@ -29274,9 +29274,9 @@
<int value="3399" label="MediaRecorder_MimeType"/>
<int value="3400" label="MediaRecorder_VideoBitsPerSecond"/>
<int value="3401" label="MediaRecorder_AudioBitsPerSecond"/>
- <int value="3402" label="BluetoothRemoteGATTCharacteristic_Uuid"/>
- <int value="3403" label="BluetoothRemoteGATTDescriptor_Uuid"/>
- <int value="3404" label="BluetoothRemoteGATTService_Uuid"/>
+ <int value="3402" label="OBSOLETE_BluetoothRemoteGATTCharacteristic_Uuid"/>
+ <int value="3403" label="OBSOLETE_BluetoothRemoteGATTDescriptor_Uuid"/>
+ <int value="3404" label="OBSOLETE_BluetoothRemoteGATTService_Uuid"/>
<int value="3405" label="GPUAdapter_Name"/>
<int value="3406" label="WindowScreenInternal"/>
<int value="3407" label="WindowScreenPrimary"/>
