Bug 1452101 [wpt PR 9962] - Revert "bluetooth: Use DeviceUUID in FakeBluetooth", a=testonly
authorTrent Apted <tapted@chromium.org>
Mon, 09 Apr 2018 14:36:17 +0000
changeset 466993 15ae72c25b3ca9bf231619c2e655a63b483bd7e6
parent 466992 d2ed890844c3341dc121b710c86c265b576d5322
child 466994 bda1d5269dd93793f8ec5a48c70829eae7f8230b
push id9165
push userasasaki@mozilla.com
push dateThu, 26 Apr 2018 21:04:54 +0000
treeherdermozilla-beta@064c3804de2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstestonly
bugs1452101, 66761, 719826, 939984, 541577, 958741, 542421
milestone61.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1452101 [wpt PR 9962] - Revert "bluetooth: Use DeviceUUID in FakeBluetooth", a=testonly Automatic update from web-platform-testsRevert "bluetooth: Use DeviceUUID in FakeBluetooth" This reverts commit af1c15b16f99d290799c83d34c111bce52447026. Reason for revert: suspected for persistent failures on Win7 Tests (dbg)(1) Unexpected Failures: * external/wpt/bluetooth/server/getPrimaryServices/blocklisted-services.https.html * external/wpt/bluetooth/service/getCharacteristic/gen-blocklisted-characteristic.https.html * external/wpt/bluetooth/service/getCharacteristics/blocklisted-characteristics.https.html * external/wpt/bluetooth/service/getCharacteristics/gen-blocklisted-characteristic-with-uuid.https.html * external/wpt/upgrade-insecure-requests/link-upgrade.sub.https.html since https://ci.chromium.org/buildbot/chromium.win/Win7%20Tests%20%28dbg%29%281%29/66761 errors like 15:59:42.310 5904 worker/4 external/wpt/bluetooth/service/getCharacteristics/gen-blocklisted-characteristic-with-uuid.https.html crashed, (stderr lines): 15:59:42.311 5904 CONSOLE MESSAGE: line 255: Web Bluetooth is experimental on this platform. See https://github.com/WebBluetoothCG/web-bluetooth/blob/gh-pages/implementation-status.md 15:59:42.327 1300 [1691/5755] external/wpt/bluetooth/service/getCharacteristics/gen-blocklisted-characteristic-with-uuid.https.html failed unexpectedly (content_shell crashed [pid=5644]) Original change's description: > bluetooth: Use DeviceUUID in FakeBluetooth > > This change refactors the Web Bluetooth test API to use the > DeviceUUIDs helper class defined in BluetoothDevice. Additionally, > this change finishes the implementation of SimulateGATTServicesChanged, > and as a result, tests are updated to set the next discovery response > before calling this interface. > > BUG=719826 > > Change-Id: I0f986eb7afe6fbf7ebaa80ac4b633d46a027b80d > Reviewed-on: https://chromium-review.googlesource.com/939984 > Commit-Queue: Ovidio Henriquez <odejesush@chromium.org> > Reviewed-by: Giovanni Ortuño Urquidi <ortuno@chromium.org> > Cr-Commit-Position: refs/heads/master@{#541577} TBR=cco3@chromium.org,ortuno@chromium.org,odejesush@chromium.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: 719826 Change-Id: I02bb7066c6f1282191f7a24e91b3d2c5614b8104 Reviewed-on: https://chromium-review.googlesource.com/958741 Reviewed-by: Trent Apted <tapted@chromium.org> Commit-Queue: Trent Apted <tapted@chromium.org> Cr-Commit-Position: refs/heads/master@{#542421} wpt-commits: cdf5b3962f33d0a05af040097173d8cc827a7d73 wpt-pr: 9962 wpt-commits: cdf5b3962f33d0a05af040097173d8cc827a7d73 wpt-pr: 9962
testing/web-platform/meta/MANIFEST.json
testing/web-platform/tests/bluetooth/characteristic/getDescriptor/gen-characteristic-is-removed.https.html
testing/web-platform/tests/bluetooth/characteristic/getDescriptor/gen-service-is-removed.https.html
testing/web-platform/tests/bluetooth/characteristic/getDescriptors/gen-characteristic-is-removed-with-uuid.https.html
testing/web-platform/tests/bluetooth/characteristic/getDescriptors/gen-characteristic-is-removed.https.html
testing/web-platform/tests/bluetooth/characteristic/getDescriptors/gen-service-is-removed-with-uuid.https.html
testing/web-platform/tests/bluetooth/characteristic/getDescriptors/gen-service-is-removed.https.html
testing/web-platform/tests/bluetooth/characteristic/notifications/service-is-removed.https.html
testing/web-platform/tests/bluetooth/characteristic/readValue/gen-characteristic-is-removed.https.html
testing/web-platform/tests/bluetooth/characteristic/readValue/service-is-removed.https.html
testing/web-platform/tests/bluetooth/characteristic/startNotifications/gen-characteristic-is-removed.https.html
testing/web-platform/tests/bluetooth/characteristic/writeValue/gen-characteristic-is-removed.https.html
testing/web-platform/tests/bluetooth/characteristic/writeValue/service-is-removed.https.html
testing/web-platform/tests/bluetooth/descriptor/readValue/gen-service-is-removed.https.html
testing/web-platform/tests/bluetooth/descriptor/writeValue/gen-service-is-removed.https.html
testing/web-platform/tests/bluetooth/script-tests/characteristic/characteristic-is-removed.js
testing/web-platform/tests/bluetooth/script-tests/characteristic/service-is-removed.js
testing/web-platform/tests/bluetooth/script-tests/descriptor/service-is-removed.js
testing/web-platform/tests/bluetooth/script-tests/service/service-is-removed.js
testing/web-platform/tests/bluetooth/service/getCharacteristic/gen-service-is-removed.https.html
testing/web-platform/tests/bluetooth/service/getCharacteristics/gen-service-is-removed-with-uuid.https.html
testing/web-platform/tests/bluetooth/service/getCharacteristics/gen-service-is-removed.https.html
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -400901,121 +400901,121 @@
    "444c97b1166ed27a2180c97c29b3568c73c693be",
    "support"
   ],
   "bluetooth/characteristic/characteristicProperties.https.html": [
    "65cc6c0367c0c2860677d2b22a8483c90eac6f2a",
    "testharness"
   ],
   "bluetooth/characteristic/getDescriptor/gen-characteristic-is-removed.https.html": [
-   "df68f7bf4028cf7d2f32bb291a008d562eac3cad",
+   "6ba1c71fa5c34f7b0321b5430fa79c75c907fc14",
    "testharness"
   ],
   "bluetooth/characteristic/getDescriptor/gen-descriptor-get-same-object.https.html": [
    "be7359ed375b28af9aab39c5b06ffbd0da1843bc",
    "testharness"
   ],
   "bluetooth/characteristic/getDescriptor/gen-service-is-removed.https.html": [
-   "ba4c6477eaa5978599e7c77d3227bc63fe6b5a3f",
+   "80c7782e7c2bba33e43d2661a3ba0d069b49e727",
    "testharness"
   ],
   "bluetooth/characteristic/getDescriptors/gen-characteristic-is-removed-with-uuid.https.html": [
-   "ae775a150cda67893dcace79396468134b5b8a60",
+   "fa068af0ac6d1629622f207b77ae95fe3f50b6cc",
    "testharness"
   ],
   "bluetooth/characteristic/getDescriptors/gen-characteristic-is-removed.https.html": [
-   "64c51958f8d520e9608e695ddf0115f460081f2f",
+   "82084e965ad35f176505631cb0b9007422bf3fd4",
    "testharness"
   ],
   "bluetooth/characteristic/getDescriptors/gen-descriptor-get-same-object.https.html": [
    "6a02e3fe8ca88b405e4183bc56c5f0bd2d6a426e",
    "testharness"
   ],
   "bluetooth/characteristic/getDescriptors/gen-service-is-removed-with-uuid.https.html": [
-   "67a1b69b198711e8c824529c2afe5513284e449f",
+   "ad2b25c264ae236332715ae92e30452c5b97954c",
    "testharness"
   ],
   "bluetooth/characteristic/getDescriptors/gen-service-is-removed.https.html": [
-   "e0746e2c992231bac0ed213b3f9b17a863db0902",
+   "1132700853cbfd7fbc0772e44a407d72f710ffb5",
    "testharness"
   ],
   "bluetooth/characteristic/notifications/characteristic-is-removed.https.html": [
    "f5b14288aad807a4aaaeee5c3ac24f8a43eb4589",
    "testharness"
   ],
   "bluetooth/characteristic/notifications/service-is-removed.https.html": [
-   "c38cba83787c54f68d57f4403a0ec0242c169035",
+   "f6a5be53c85a190dca81a9b425b63d77bc6c193f",
    "testharness"
   ],
   "bluetooth/characteristic/readValue/add-multiple-event-listeners.https.html": [
    "4bb6355e47507c0e57498533d060106dda0051d4",
    "testharness"
   ],
   "bluetooth/characteristic/readValue/characteristic-is-removed.https.html": [
    "69e6a733b4d72a1f7f41b26d65fd874fa944aff5",
    "testharness"
   ],
   "bluetooth/characteristic/readValue/event-is-fired.https.html": [
    "ce736454ce04bcb34be9d1e76f77903ba3f3e805",
    "testharness"
   ],
   "bluetooth/characteristic/readValue/gen-characteristic-is-removed.https.html": [
-   "e775062bd01919af48f2c3e11ea2e90702b29064",
+   "1700dfa9ba6e1aa44d42630ef7ba61d4beeed330",
    "testharness"
   ],
   "bluetooth/characteristic/readValue/read-succeeds.https.html": [
    "a87d20692160f3a26fbfde8cfbc8750c0eeb7a65",
    "testharness"
   ],
   "bluetooth/characteristic/readValue/read-updates-value.https.html": [
    "e8daa0dedd43a87996093e5b2507a83572eadb43",
    "testharness"
   ],
   "bluetooth/characteristic/readValue/service-is-removed.https.html": [
-   "1267b87396e49b063db2a7e5fe8611ef4f39845d",
+   "b79a74ccf33bc76e6582ee7c1e2f3c277f99ddfb",
    "testharness"
   ],
   "bluetooth/characteristic/service-same-from-2-characteristics.https.html": [
    "975aff2aff29d024b7afd73fc301244e490951a7",
    "testharness"
   ],
   "bluetooth/characteristic/service-same-object.https.html": [
    "61955287698126b45ccc44f296b53a5876e23858",
    "testharness"
   ],
   "bluetooth/characteristic/startNotifications/gen-characteristic-is-removed.https.html": [
-   "471854c3309862acd121c7ef8d115b037ec297dd",
+   "97f5d01743721207c5addfb9625fd3da7c0c61e3",
    "testharness"
   ],
   "bluetooth/characteristic/writeValue/characteristic-is-removed.https.html": [
    "08efca72e1b522baf8f704f8589cf453b4c2b64b",
    "testharness"
   ],
   "bluetooth/characteristic/writeValue/gen-characteristic-is-removed.https.html": [
-   "2bad4acf374516e29cb5a259d29a97160917ec58",
+   "62b4bd66196c9c833631916761b41e973aa2a554",
    "testharness"
   ],
   "bluetooth/characteristic/writeValue/service-is-removed.https.html": [
-   "570bba21ad98a428dd5575dc544962b8ae6a05d8",
+   "857ae985ba4d15bcc5d78671a7f21d990c8db9c5",
    "testharness"
   ],
   "bluetooth/characteristic/writeValue/write-succeeds.https.html": [
    "8dcaba2c0c6d277c006dd131f1f306918ac80c49",
    "testharness"
   ],
   "bluetooth/descriptor/readValue/gen-service-is-removed.https.html": [
-   "c1954f13b95b9f5d0dbfd4f696aa0874e2a47c88",
+   "47f1bd316ae7d2637524a1b5d4436a3f11b20fd0",
    "testharness"
   ],
   "bluetooth/descriptor/readValue/read-succeeds.https.html": [
    "dc7dd900f79a9205af3e904a309d565ae409afe9",
    "testharness"
   ],
   "bluetooth/descriptor/writeValue/gen-service-is-removed.https.html": [
-   "99c77b594dcdfa971bdf96b28c176bf2e44a98ca",
+   "07c2dc0a081786302040942a989cc49f6b3fa3ca",
    "testharness"
   ],
   "bluetooth/device/gattserverdisconnected-event/disconnected.https.html": [
    "ee14803683f17133c6147c2eaf250befbaaf0be1",
    "testharness"
   ],
   "bluetooth/device/gattserverdisconnected-event/disconnected_gc.https.html": [
    "6b4676f3b9b34ffa45ff616eb9d3c514e33ad471",
@@ -401209,29 +401209,29 @@
    "f175a62907e65c03e326832449b0b8e3276387d8",
    "support"
   ],
   "bluetooth/script-tests/base_test_html.template": [
    "abe5c81d5d9be9b0c6069ba0a465ca3efc24b442",
    "support"
   ],
   "bluetooth/script-tests/characteristic/characteristic-is-removed.js": [
-   "a82d6a1761e402906aa89a790166bccf1dd0a2c2",
+   "7b7cd34d4c480e62fcde4667f50212cbae7f7b07",
    "support"
   ],
   "bluetooth/script-tests/characteristic/descriptor-get-same-object.js": [
    "2664262ff94976691ab7811e7b342cfd40e11190",
    "support"
   ],
   "bluetooth/script-tests/characteristic/service-is-removed.js": [
-   "c4703192b632d2bc63609b717d5f7829aad6168e",
+   "a9fa621bca75da2887835c529b40429a20ebdff8",
    "support"
   ],
   "bluetooth/script-tests/descriptor/service-is-removed.js": [
-   "ef6afb686e14a5b77cc88f6c51c18529739fc7ea",
+   "d442ab654680a3f4c7eae6036f74a20f0b730351",
    "support"
   ],
   "bluetooth/script-tests/server/disconnect-called-before.js": [
    "3ea0ed09ee2197401437b4d89c335181b2983b17",
    "support"
   ],
   "bluetooth/script-tests/server/disconnect-called-during-error.js": [
    "43089297c181c29f633ed9dc574313aac34d4ba3",
@@ -401313,17 +401313,17 @@
    "7c16b4edc418b3e6635d0a27dcced11c332cc2e2",
    "support"
   ],
   "bluetooth/script-tests/service/reconnect-during.js": [
    "fc89c44348fa1bb141d9d6d16b487cd3ea1e1d5d",
    "support"
   ],
   "bluetooth/script-tests/service/service-is-removed.js": [
-   "209d46cebac1cf324dacb9741bbd7a320b70651c",
+   "ef77b77f70ac720b536882e9b48d7fe66fe4ecf4",
    "support"
   ],
   "bluetooth/server/connect/connection-succeeds.https.html": [
    "167880b07f855325a35a81a8ea833b0d006c7957",
    "testharness"
   ],
   "bluetooth/server/connect/garbage-collection-ran-during-success.https.html": [
    "9186c8cef9bc2e170175b811cfd85f69883b14ec",
@@ -401585,17 +401585,17 @@
    "9d500137650d30e6ecdd2fdaa7ea0957030343ea",
    "testharness"
   ],
   "bluetooth/service/getCharacteristic/gen-reconnect-during.https.html": [
    "2c155e835979269072d21a473010eded488ac185",
    "testharness"
   ],
   "bluetooth/service/getCharacteristic/gen-service-is-removed.https.html": [
-   "8680cb14d493830e9e5ded9d4d07a6e12e2f2fee",
+   "9f698f4e02985f21f772d38942d7fe9f383600f0",
    "testharness"
   ],
   "bluetooth/service/getCharacteristics/blocklisted-characteristics.https.html": [
    "cb0ff8a9913b54ef624a38d367d84b1656b2a536",
    "testharness"
   ],
   "bluetooth/service/getCharacteristics/characteristics-found-with-uuid.https.html": [
    "b0fe70ff6c0f473079469a21984baf59143d51e9",
@@ -401641,21 +401641,21 @@
    "3b89e9e5a43f2a6791ac5a5e3b58552a696420f8",
    "testharness"
   ],
   "bluetooth/service/getCharacteristics/gen-reconnect-during.https.html": [
    "bc66082c4b04df83449fcf883d0e8e96dc3d8b61",
    "testharness"
   ],
   "bluetooth/service/getCharacteristics/gen-service-is-removed-with-uuid.https.html": [
-   "b67765aaf66b9ac679e018014127836ae9a1753e",
+   "d8e4257645340adfd45f069c4cebbc3ca88f2348",
    "testharness"
   ],
   "bluetooth/service/getCharacteristics/gen-service-is-removed.https.html": [
-   "baadfc8451547b9b1a863b222009f230fc2b032b",
+   "417d39a317f55a95180c806d28047c85dd959d65",
    "testharness"
   ],
   "clear-site-data/navigation-insecure.html": [
    "97c069cf7c938e1ebdba3f243ad48369a7fb5542",
    "testharness"
   ],
   "clear-site-data/navigation.https.html": [
    "462ebc571ae718c9b34ed78e8798c9edfec18e8d",
--- a/testing/web-platform/tests/bluetooth/characteristic/getDescriptor/gen-characteristic-is-removed.https.html
+++ b/testing/web-platform/tests/bluetooth/characteristic/getDescriptor/gen-characteristic-is-removed.https.html
@@ -12,15 +12,14 @@ const expected = new DOMException('GATT 
                                   'InvalidStateError');
 let fake_peripheral, characteristic, fake_characteristic;
 
 bluetooth_test(() => getMeasurementIntervalCharacteristic()
     .then(_ => ({fake_peripheral, characteristic, fake_characteristic} = _))
     .then(() => characteristic.getDescriptor(user_description.name))
     .then(() => null, (e) => assert_unreached('Caught error unexpectedly.', e))
     .then(() => fake_characteristic.remove())
-    .then(() => fake_peripheral.setNextGATTDiscoveryResponse({HCI_SUCCESS}))
     .then(() => fake_peripheral.simulateGATTServicesChanged())
     .then(() => assert_promise_rejects_with_message(
       characteristic.getDescriptor(user_description.name), expected)),
     test_desc);
 
 </script>
--- a/testing/web-platform/tests/bluetooth/characteristic/getDescriptor/gen-service-is-removed.https.html
+++ b/testing/web-platform/tests/bluetooth/characteristic/getDescriptor/gen-service-is-removed.https.html
@@ -12,17 +12,16 @@
 const test_desc = 'Service is removed. Reject with InvalidStateError.';
 const expected = new DOMException('GATT Service no longer exists.',
     'InvalidStateError');
 let characteristic, fake_peripheral, fake_service;
 
 bluetooth_test(() => getMeasurementIntervalCharacteristic()
     .then(_ => ({characteristic, fake_peripheral, fake_service} = _))
     .then(() => fake_service.remove())
-    .then(() => fake_peripheral.setNextGATTDiscoveryResponse({HCI_SUCCESS}))
     .then(() => fake_peripheral.simulateGATTServicesChanged())
     .then(() => assert_promise_rejects_with_message(
         characteristic.getDescriptor(user_description.name),
         expected,
         'Service got removed.')),
     test_desc);
 
 </script>
--- a/testing/web-platform/tests/bluetooth/characteristic/getDescriptors/gen-characteristic-is-removed-with-uuid.https.html
+++ b/testing/web-platform/tests/bluetooth/characteristic/getDescriptors/gen-characteristic-is-removed-with-uuid.https.html
@@ -12,15 +12,14 @@ const expected = new DOMException('GATT 
                                   'InvalidStateError');
 let fake_peripheral, characteristic, fake_characteristic;
 
 bluetooth_test(() => getMeasurementIntervalCharacteristic()
     .then(_ => ({fake_peripheral, characteristic, fake_characteristic} = _))
     .then(() => characteristic.getDescriptor(user_description.name))
     .then(() => null, (e) => assert_unreached('Caught error unexpectedly.', e))
     .then(() => fake_characteristic.remove())
-    .then(() => fake_peripheral.setNextGATTDiscoveryResponse({HCI_SUCCESS}))
     .then(() => fake_peripheral.simulateGATTServicesChanged())
     .then(() => assert_promise_rejects_with_message(
       characteristic.getDescriptors(user_description.name), expected)),
     test_desc);
 
 </script>
--- a/testing/web-platform/tests/bluetooth/characteristic/getDescriptors/gen-characteristic-is-removed.https.html
+++ b/testing/web-platform/tests/bluetooth/characteristic/getDescriptors/gen-characteristic-is-removed.https.html
@@ -12,15 +12,14 @@ const expected = new DOMException('GATT 
                                   'InvalidStateError');
 let fake_peripheral, characteristic, fake_characteristic;
 
 bluetooth_test(() => getMeasurementIntervalCharacteristic()
     .then(_ => ({fake_peripheral, characteristic, fake_characteristic} = _))
     .then(() => characteristic.getDescriptor(user_description.name))
     .then(() => null, (e) => assert_unreached('Caught error unexpectedly.', e))
     .then(() => fake_characteristic.remove())
-    .then(() => fake_peripheral.setNextGATTDiscoveryResponse({HCI_SUCCESS}))
     .then(() => fake_peripheral.simulateGATTServicesChanged())
     .then(() => assert_promise_rejects_with_message(
       characteristic.getDescriptors(), expected)),
     test_desc);
 
 </script>
--- a/testing/web-platform/tests/bluetooth/characteristic/getDescriptors/gen-service-is-removed-with-uuid.https.html
+++ b/testing/web-platform/tests/bluetooth/characteristic/getDescriptors/gen-service-is-removed-with-uuid.https.html
@@ -12,17 +12,16 @@
 const test_desc = 'Service is removed. Reject with InvalidStateError.';
 const expected = new DOMException('GATT Service no longer exists.',
     'InvalidStateError');
 let characteristic, fake_peripheral, fake_service;
 
 bluetooth_test(() => getMeasurementIntervalCharacteristic()
     .then(_ => ({characteristic, fake_peripheral, fake_service} = _))
     .then(() => fake_service.remove())
-    .then(() => fake_peripheral.setNextGATTDiscoveryResponse({HCI_SUCCESS}))
     .then(() => fake_peripheral.simulateGATTServicesChanged())
     .then(() => assert_promise_rejects_with_message(
         characteristic.getDescriptors(user_description.uuid),
         expected,
         'Service got removed.')),
     test_desc);
 
 </script>
--- a/testing/web-platform/tests/bluetooth/characteristic/getDescriptors/gen-service-is-removed.https.html
+++ b/testing/web-platform/tests/bluetooth/characteristic/getDescriptors/gen-service-is-removed.https.html
@@ -12,17 +12,16 @@
 const test_desc = 'Service is removed. Reject with InvalidStateError.';
 const expected = new DOMException('GATT Service no longer exists.',
     'InvalidStateError');
 let characteristic, fake_peripheral, fake_service;
 
 bluetooth_test(() => getMeasurementIntervalCharacteristic()
     .then(_ => ({characteristic, fake_peripheral, fake_service} = _))
     .then(() => fake_service.remove())
-    .then(() => fake_peripheral.setNextGATTDiscoveryResponse({HCI_SUCCESS}))
     .then(() => fake_peripheral.simulateGATTServicesChanged())
     .then(() => assert_promise_rejects_with_message(
         characteristic.getDescriptors(user_description.name),
         expected,
         'Service got removed.')),
     test_desc);
 
 </script>
--- a/testing/web-platform/tests/bluetooth/characteristic/notifications/service-is-removed.https.html
+++ b/testing/web-platform/tests/bluetooth/characteristic/notifications/service-is-removed.https.html
@@ -9,16 +9,15 @@
 const test_desc = 'Service is removed. Reject with InvalidStateError.';
 const expected = new DOMException('GATT Service no longer exists.',
     'InvalidStateError');
 let characteristic, fake_peripheral, fake_service;
 
 bluetooth_test(() => getMeasurementIntervalCharacteristic()
     .then(_ => ({characteristic, fake_peripheral, fake_service} = _))
     .then(() => fake_service.remove())
-    .then(() => fake_peripheral.setNextGATTDiscoveryResponse({HCI_SUCCESS}))
     .then(() => fake_peripheral.simulateGATTServicesChanged())
     .then(() => assert_promise_rejects_with_message(
         characteristic.startNotifications(),
         expected,
         'Service got removed.')),
     test_desc);
 </script>
--- a/testing/web-platform/tests/bluetooth/characteristic/readValue/gen-characteristic-is-removed.https.html
+++ b/testing/web-platform/tests/bluetooth/characteristic/readValue/gen-characteristic-is-removed.https.html
@@ -12,15 +12,14 @@ const expected = new DOMException('GATT 
                                   'InvalidStateError');
 let fake_peripheral, characteristic, fake_characteristic;
 
 bluetooth_test(() => getMeasurementIntervalCharacteristic()
     .then(_ => ({fake_peripheral, characteristic, fake_characteristic} = _))
     .then(() => characteristic.getDescriptor(user_description.name))
     .then(() => null, (e) => assert_unreached('Caught error unexpectedly.', e))
     .then(() => fake_characteristic.remove())
-    .then(() => fake_peripheral.setNextGATTDiscoveryResponse({HCI_SUCCESS}))
     .then(() => fake_peripheral.simulateGATTServicesChanged())
     .then(() => assert_promise_rejects_with_message(
       characteristic.readValue(), expected)),
     test_desc);
 
 </script>
--- a/testing/web-platform/tests/bluetooth/characteristic/readValue/service-is-removed.https.html
+++ b/testing/web-platform/tests/bluetooth/characteristic/readValue/service-is-removed.https.html
@@ -9,16 +9,15 @@
 const test_desc = 'Service gets removed. Reject with InvalidStateError.';
 const expected = new DOMException('GATT Service no longer exists.',
     'InvalidStateError');
 let characteristic, fake_peripheral, fake_service;
 
 bluetooth_test(() => getMeasurementIntervalCharacteristic()
     .then(_ => ({characteristic, fake_peripheral, fake_service} = _))
     .then(() => fake_service.remove())
-    .then(() => fake_peripheral.setNextGATTDiscoveryResponse({HCI_SUCCESS}))
     .then(() => fake_peripheral.simulateGATTServicesChanged())
     .then(() => assert_promise_rejects_with_message(
         characteristic.readValue(),
         expected,
         'Service got removed.')),
     test_desc);
 </script>
--- a/testing/web-platform/tests/bluetooth/characteristic/startNotifications/gen-characteristic-is-removed.https.html
+++ b/testing/web-platform/tests/bluetooth/characteristic/startNotifications/gen-characteristic-is-removed.https.html
@@ -12,15 +12,14 @@ const expected = new DOMException('GATT 
                                   'InvalidStateError');
 let fake_peripheral, characteristic, fake_characteristic;
 
 bluetooth_test(() => getMeasurementIntervalCharacteristic()
     .then(_ => ({fake_peripheral, characteristic, fake_characteristic} = _))
     .then(() => characteristic.getDescriptor(user_description.name))
     .then(() => null, (e) => assert_unreached('Caught error unexpectedly.', e))
     .then(() => fake_characteristic.remove())
-    .then(() => fake_peripheral.setNextGATTDiscoveryResponse({HCI_SUCCESS}))
     .then(() => fake_peripheral.simulateGATTServicesChanged())
     .then(() => assert_promise_rejects_with_message(
       characteristic.startNotifications(), expected)),
     test_desc);
 
 </script>
--- a/testing/web-platform/tests/bluetooth/characteristic/writeValue/gen-characteristic-is-removed.https.html
+++ b/testing/web-platform/tests/bluetooth/characteristic/writeValue/gen-characteristic-is-removed.https.html
@@ -12,15 +12,14 @@ const expected = new DOMException('GATT 
                                   'InvalidStateError');
 let fake_peripheral, characteristic, fake_characteristic;
 
 bluetooth_test(() => getMeasurementIntervalCharacteristic()
     .then(_ => ({fake_peripheral, characteristic, fake_characteristic} = _))
     .then(() => characteristic.getDescriptor(user_description.name))
     .then(() => null, (e) => assert_unreached('Caught error unexpectedly.', e))
     .then(() => fake_characteristic.remove())
-    .then(() => fake_peripheral.setNextGATTDiscoveryResponse({HCI_SUCCESS}))
     .then(() => fake_peripheral.simulateGATTServicesChanged())
     .then(() => assert_promise_rejects_with_message(
       characteristic.writeValue(new Uint8Array(1)), expected)),
     test_desc);
 
 </script>
--- a/testing/web-platform/tests/bluetooth/characteristic/writeValue/service-is-removed.https.html
+++ b/testing/web-platform/tests/bluetooth/characteristic/writeValue/service-is-removed.https.html
@@ -9,16 +9,15 @@
 const test_desc = 'Service gets removed. Reject with InvalidStateError.';
 const expected = new DOMException('GATT Service no longer exists.',
     'InvalidStateError');
 let characteristic, fake_peripheral, fake_service;
 
 bluetooth_test(() => getMeasurementIntervalCharacteristic()
     .then(_ => ({characteristic, fake_peripheral, fake_service} = _))
     .then(() => fake_service.remove())
-    .then(() => fake_peripheral.setNextGATTDiscoveryResponse({HCI_SUCCESS}))
     .then(() => fake_peripheral.simulateGATTServicesChanged())
     .then(() => assert_promise_rejects_with_message(
         characteristic.writeValue(new ArrayBuffer(1 /* length */)),
         expected,
         'Service got removed.')),
     test_desc);
 </script>
--- a/testing/web-platform/tests/bluetooth/descriptor/readValue/gen-service-is-removed.https.html
+++ b/testing/web-platform/tests/bluetooth/descriptor/readValue/gen-service-is-removed.https.html
@@ -10,17 +10,16 @@
 const test_desc = 'Service gets removed. Reject with InvalidStateError.';
 const expected = new DOMException('GATT Service no longer exists.',
     'InvalidStateError');
 let descriptor, fake_peripheral, fake_service;
 
 bluetooth_test(() => getUserDescriptionDescriptor()
     .then(_ => ({descriptor, fake_peripheral, fake_service} = _))
     .then(() => fake_service.remove())
-    .then(() => fake_peripheral.setNextGATTDiscoveryResponse({HCI_SUCCESS}))
     .then(() => fake_peripheral.simulateGATTServicesChanged())
     .then(() => assert_promise_rejects_with_message(
         descriptor.readValue(),
         expected,
         'Service got removed.')),
     test_desc);
 
 </script>
--- a/testing/web-platform/tests/bluetooth/descriptor/writeValue/gen-service-is-removed.https.html
+++ b/testing/web-platform/tests/bluetooth/descriptor/writeValue/gen-service-is-removed.https.html
@@ -10,17 +10,16 @@
 const test_desc = 'Service gets removed. Reject with InvalidStateError.';
 const expected = new DOMException('GATT Service no longer exists.',
     'InvalidStateError');
 let descriptor, fake_peripheral, fake_service;
 
 bluetooth_test(() => getUserDescriptionDescriptor()
     .then(_ => ({descriptor, fake_peripheral, fake_service} = _))
     .then(() => fake_service.remove())
-    .then(() => fake_peripheral.setNextGATTDiscoveryResponse({HCI_SUCCESS}))
     .then(() => fake_peripheral.simulateGATTServicesChanged())
     .then(() => assert_promise_rejects_with_message(
         descriptor.writeValue(new ArrayBuffer(1 /* length */)),
         expected,
         'Service got removed.')),
     test_desc);
 
 </script>
--- a/testing/web-platform/tests/bluetooth/script-tests/characteristic/characteristic-is-removed.js
+++ b/testing/web-platform/tests/bluetooth/script-tests/characteristic/characteristic-is-removed.js
@@ -4,17 +4,16 @@ const expected = new DOMException('GATT 
                                   'InvalidStateError');
 let fake_peripheral, characteristic, fake_characteristic;
 
 bluetooth_test(() => getMeasurementIntervalCharacteristic()
     .then(_ => ({fake_peripheral, characteristic, fake_characteristic} = _))
     .then(() => characteristic.getDescriptor(user_description.name))
     .then(() => null, (e) => assert_unreached('Caught error unexpectedly.', e))
     .then(() => fake_characteristic.remove())
-    .then(() => fake_peripheral.setNextGATTDiscoveryResponse({HCI_SUCCESS}))
     .then(() => fake_peripheral.simulateGATTServicesChanged())
     .then(() => assert_promise_rejects_with_message(
       characteristic.CALLS([
         getDescriptor(user_description.name)|
         getDescriptors(user_description.name)[UUID]|
         getDescriptors()|
         readValue()|
         writeValue(new Uint8Array(1))|
--- a/testing/web-platform/tests/bluetooth/script-tests/characteristic/service-is-removed.js
+++ b/testing/web-platform/tests/bluetooth/script-tests/characteristic/service-is-removed.js
@@ -4,17 +4,16 @@
 const test_desc = 'Service is removed. Reject with InvalidStateError.';
 const expected = new DOMException('GATT Service no longer exists.',
     'InvalidStateError');
 let characteristic, fake_peripheral, fake_service;
 
 bluetooth_test(() => getMeasurementIntervalCharacteristic()
     .then(_ => ({characteristic, fake_peripheral, fake_service} = _))
     .then(() => fake_service.remove())
-    .then(() => fake_peripheral.setNextGATTDiscoveryResponse({HCI_SUCCESS}))
     .then(() => fake_peripheral.simulateGATTServicesChanged())
     .then(() => assert_promise_rejects_with_message(
         characteristic.CALLS([
           getDescriptor(user_description.name)|
           getDescriptors(user_description.uuid)[UUID]|
           getDescriptors(user_description.name)]),
         expected,
         'Service got removed.')),
--- a/testing/web-platform/tests/bluetooth/script-tests/descriptor/service-is-removed.js
+++ b/testing/web-platform/tests/bluetooth/script-tests/descriptor/service-is-removed.js
@@ -2,17 +2,16 @@
 const test_desc = 'Service gets removed. Reject with InvalidStateError.';
 const expected = new DOMException('GATT Service no longer exists.',
     'InvalidStateError');
 let descriptor, fake_peripheral, fake_service;
 
 bluetooth_test(() => getUserDescriptionDescriptor()
     .then(_ => ({descriptor, fake_peripheral, fake_service} = _))
     .then(() => fake_service.remove())
-    .then(() => fake_peripheral.setNextGATTDiscoveryResponse({HCI_SUCCESS}))
     .then(() => fake_peripheral.simulateGATTServicesChanged())
     .then(() => assert_promise_rejects_with_message(
         descriptor.CALLS([
           readValue()|
           writeValue(new ArrayBuffer(1 /* length */))
         ]),
         expected,
         'Service got removed.')),
--- a/testing/web-platform/tests/bluetooth/script-tests/service/service-is-removed.js
+++ b/testing/web-platform/tests/bluetooth/script-tests/service/service-is-removed.js
@@ -3,17 +3,16 @@ const test_desc = 'Service is removed be
     'Reject with InvalidStateError.';
 const expected = new DOMException('GATT Service no longer exists.',
     'InvalidStateError');
 let service, fake_service, fake_peripheral;
 
 bluetooth_test(() => getHealthThermometerService()
     .then(_ => ({service, fake_service, fake_peripheral} = _))
     .then(() => fake_service.remove())
-    .then(() => fake_peripheral.setNextGATTDiscoveryResponse({HCI_SUCCESS}))
     .then(() => fake_peripheral.simulateGATTServicesChanged())
     .then(() => assert_promise_rejects_with_message(
         service.CALLS([
           getCharacteristic('measurement_interval')|
           getCharacteristics()|
           getCharacteristics('measurement_interval')[UUID]
         ]),
         expected,
--- a/testing/web-platform/tests/bluetooth/service/getCharacteristic/gen-service-is-removed.https.html
+++ b/testing/web-platform/tests/bluetooth/service/getCharacteristic/gen-service-is-removed.https.html
@@ -11,17 +11,16 @@ const test_desc = 'Service is removed be
     'Reject with InvalidStateError.';
 const expected = new DOMException('GATT Service no longer exists.',
     'InvalidStateError');
 let service, fake_service, fake_peripheral;
 
 bluetooth_test(() => getHealthThermometerService()
     .then(_ => ({service, fake_service, fake_peripheral} = _))
     .then(() => fake_service.remove())
-    .then(() => fake_peripheral.setNextGATTDiscoveryResponse({HCI_SUCCESS}))
     .then(() => fake_peripheral.simulateGATTServicesChanged())
     .then(() => assert_promise_rejects_with_message(
         service.getCharacteristic('measurement_interval'),
         expected,
         'Service got removed.')),
     test_desc);
 
 </script>
--- a/testing/web-platform/tests/bluetooth/service/getCharacteristics/gen-service-is-removed-with-uuid.https.html
+++ b/testing/web-platform/tests/bluetooth/service/getCharacteristics/gen-service-is-removed-with-uuid.https.html
@@ -11,17 +11,16 @@ const test_desc = 'Service is removed be
     'Reject with InvalidStateError.';
 const expected = new DOMException('GATT Service no longer exists.',
     'InvalidStateError');
 let service, fake_service, fake_peripheral;
 
 bluetooth_test(() => getHealthThermometerService()
     .then(_ => ({service, fake_service, fake_peripheral} = _))
     .then(() => fake_service.remove())
-    .then(() => fake_peripheral.setNextGATTDiscoveryResponse({HCI_SUCCESS}))
     .then(() => fake_peripheral.simulateGATTServicesChanged())
     .then(() => assert_promise_rejects_with_message(
         service.getCharacteristics('measurement_interval'),
         expected,
         'Service got removed.')),
     test_desc);
 
 </script>
--- a/testing/web-platform/tests/bluetooth/service/getCharacteristics/gen-service-is-removed.https.html
+++ b/testing/web-platform/tests/bluetooth/service/getCharacteristics/gen-service-is-removed.https.html
@@ -11,17 +11,16 @@ const test_desc = 'Service is removed be
     'Reject with InvalidStateError.';
 const expected = new DOMException('GATT Service no longer exists.',
     'InvalidStateError');
 let service, fake_service, fake_peripheral;
 
 bluetooth_test(() => getHealthThermometerService()
     .then(_ => ({service, fake_service, fake_peripheral} = _))
     .then(() => fake_service.remove())
-    .then(() => fake_peripheral.setNextGATTDiscoveryResponse({HCI_SUCCESS}))
     .then(() => fake_peripheral.simulateGATTServicesChanged())
     .then(() => assert_promise_rejects_with_message(
         service.getCharacteristics(),
         expected,
         'Service got removed.')),
     test_desc);
 
 </script>