bluetooth: Reject getPrimaryService(s) if frame is not connected

third_party/WebKit/LayoutTests/bluetooth/getPrimaryServices/device-disconnects-before-with-uuid.html

Index: third_party/WebKit/LayoutTests/bluetooth/getPrimaryServices/device-disconnects-before-with-uuid.html
diff --git a/third_party/WebKit/LayoutTests/bluetooth/gattserverdisconnected-event/disconnected.html b/third_party/WebKit/LayoutTests/bluetooth/getPrimaryServices/device-disconnects-before-with-uuid.html
similarity index 51%
copy from third_party/WebKit/LayoutTests/bluetooth/gattserverdisconnected-event/disconnected.html
copy to third_party/WebKit/LayoutTests/bluetooth/getPrimaryServices/device-disconnects-before-with-uuid.html
index 7cb69a3e8caa37ccf75ae69067434666df852429..e7eaa60ec224d5ee107bb19c1d20bbf23bc493b2 100644
--- a/third_party/WebKit/LayoutTests/bluetooth/gattserverdisconnected-event/disconnected.html
+++ b/third_party/WebKit/LayoutTests/bluetooth/getPrimaryServices/device-disconnects-before-with-uuid.html
@@ -3,9 +3,9 @@
 <script src="../../resources/testharnessreport.js"></script>
 <script src="../../resources/bluetooth/bluetooth-helpers.js"></script>
 <script>
- 'use strict';
- promise_test(t => {
-   return setBluetoothFakeAdapter('DisconnectingHeartRateAdapter')
+'use strict';
+promise_test(t => {
+  return setBluetoothFakeAdapter('DisconnectingHeartRateAdapter')
     .then(() => requestDeviceWithKeyDown({
       filters: [{services: ['heart_rate']}],
       optionalServices: [request_disconnection_service_uuid]
@@ -14,12 +14,11 @@
       return device.gatt.connect()
         .then(gattServer => gattServer.getPrimaryService(request_disconnection_service_uuid))
         .then(service => service.getCharacteristic(request_disconnection_characteristic_uuid))
-        .then(requestDisconnection => {
-          // This promise hangs unless gattserverdisconnected is fired.
-          let disconnected = eventPromise(device, 'gattserverdisconnected');
-          return Promise.all([requestDisconnection.writeValue(new Uint8Array([0])),
-                              disconnected]);
-        }).then(([, disconnected]) => assert_true(disconnected.bubbles));
+        .then(requestDisconnection => requestDisconnection.writeValue(new Uint8Array([0])))
+        .then(() => assert_promise_rejects_with_message(
+          device.gatt.getPrimaryServices('heart_rate'),
+          new DOMException('GATT Server is disconnected. Cannot retrieve services.',
+                           'NetworkError')));
     });
- }, 'A device disconnecting while connected should fire the gattserverdisconnected event.');
+}, 'Device disconnects before getPrimaryServices. Reject with NetworkError.');
 </script>