bluetooth: web: test: Use AllResponsesConsumed

This change uses AllResponsesConsumed in the bluetooth Web Platform
Tests in order to make sure we have consumed all the anticipatory
responses that we've set on our fakes.

BUG=569709

Change-Id: I9767792fcd5dda71fabf2f8941638f744aefa2dc
Reviewed-on: https://chromium-review.googlesource.com/988422
Commit-Queue: Conley Owens <cco3@chromium.org>
Reviewed-by: Giovanni Ortuño Urquidi <ortuno@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548125}

device/bluetooth/test/fake_bluetooth.cc

@@ -43,7 +43,11 @@ void FakeBluetooth::SimulateCentral(mojom::CentralState state,
 
 void FakeBluetooth::AllResponsesConsumed(
     AllResponsesConsumedCallback callback) {
-  std::move(callback).Run(fake_central_->AllResponsesConsumed());
+  if (fake_central_) {
+    std::move(callback).Run(fake_central_->AllResponsesConsumed());
+    return;
+  }
+  std::move(callback).Run(true);
 }
 
 }  // namespace bluetooth

third_party/WebKit/LayoutTests/external/wpt/bluetooth/device/gattserverdisconnected-event/disconnected.https.html

@@ -9,7 +9,7 @@
 const test_desc = 'A device disconnecting while connected should fire the ' +
     'gattserverdisconnected event.';
 
-bluetooth_test(() => getHealthThermometerDevice()
+bluetooth_test(() => getConnectedHealthThermometerDevice()
   .then(({device, fake_peripheral}) => {
     fake_peripheral.simulateGATTDisconnection();
     return eventPromise(device, 'gattserverdisconnected');

third_party/WebKit/LayoutTests/external/wpt/bluetooth/device/gattserverdisconnected-event/disconnected_gc.https.html

@@ -9,7 +9,7 @@
 const test_desc = 'A device disconnecting after the BluetoothDevice object ' +
     'has been GC\'ed should not access freed memory.';
 
-bluetooth_test(() => getHealthThermometerDevice()
+bluetooth_test(() => getConnectedHealthThermometerDevice()
   .then(({fake_peripheral}) => {
     // 1. Disconnect.
     fake_peripheral.simulateGATTDisconnection();

third_party/WebKit/LayoutTests/external/wpt/bluetooth/device/gattserverdisconnected-event/one-event-per-disconnection.https.html

@@ -12,7 +12,7 @@ const test_desc = 'If a site disconnects from a device while the platform is ' +
 let device, fake_peripheral;
 let num_events = 0;
 
-bluetooth_test(() => getHealthThermometerDevice()
+bluetooth_test(() => getConnectedHealthThermometerDevice()
   .then(_ => ({device, fake_peripheral} = _))
   // 1. Listen for disconnections.
   .then(() =>

third_party/WebKit/LayoutTests/external/wpt/bluetooth/device/gattserverdisconnected-event/reconnect-during-disconnected-event.https.html

@@ -10,7 +10,7 @@ let test_desc = 'A device that reconnects during the gattserverdisconnected ' +
     'event should still receive gattserverdisconnected events after ' +
     're-connection.';
 let device, fake_peripheral;
-bluetooth_test(() => getHealthThermometerDevice()
+bluetooth_test(() => getConnectedHealthThermometerDevice()
   .then(_ => ({device, fake_peripheral} = _))
   // 1. Disconnect.
   .then(() => new Promise(resolve => {

third_party/WebKit/LayoutTests/external/wpt/bluetooth/idl/idl-BluetoothDevice.https.html

@@ -17,7 +17,7 @@ test(() => {
 
 const test_desc_attr = 'BluetoothDevice attributes.';
 let device;
-bluetooth_test(() => getHealthThermometerDevice()
+bluetooth_test(() => getConnectedHealthThermometerDevice()
   .then(({device}) => {
     assert_equals(device.constructor.name, 'BluetoothDevice');
     var old_device_id = device.id;

third_party/WebKit/LayoutTests/external/wpt/bluetooth/requestDevice/acceptAllDevices/optional-services-missing.https.html

@@ -14,7 +14,7 @@ const expected = new DOMException(
     'requestDevice() options. https://goo.gl/HxfxSQ',
     'SecurityError');
 
-bluetooth_test(() => getHealthThermometerDevice({acceptAllDevices: true})
+bluetooth_test(() => getConnectedHealthThermometerDevice({acceptAllDevices: true})
     .then(({device}) => assert_promise_rejects_with_message(
       device.gatt.getPrimaryServices(),
       expected)),

third_party/WebKit/LayoutTests/external/wpt/bluetooth/requestDevice/blocklisted-service-in-optionalServices.https.html

@@ -22,8 +22,6 @@ bluetooth_test(() => getDiscoveredHealthThermometerDevice({
     .then(() =>
         fake_peripheral.setNextGATTConnectionResponse({code: HCI_SUCCESS}))
     .then(() => device.gatt.connect())
-    .then(() =>
-        fake_peripheral.setNextGATTDiscoveryResponse({code: HCI_SUCCESS}))
     .then(() => Promise.all([
       assert_promise_rejects_with_message(
         device.gatt.getPrimaryService('human_interface_device'),

third_party/WebKit/LayoutTests/external/wpt/bluetooth/requestDevice/cross-origin-iframe.sub.https.html

@@ -13,7 +13,7 @@ const cross_origin_src = 'https://{{domains[www]}}:{{ports[https][0]}}' +
     '/bluetooth/resources/health-thermometer-iframe.html'
 let iframe = document.createElement('iframe');
 
-bluetooth_test(() => setUpConnectableHealthThermometerDevice()
+bluetooth_test(() => setUpHealthThermometerDevice()
     // 1. Load the iframe.
     .then(() => new Promise(resolve => {
       iframe.src = cross_origin_src;

third_party/WebKit/LayoutTests/external/wpt/bluetooth/requestDevice/discovery-succeeds.https.html

@@ -8,7 +8,7 @@
 'use strict';
 const test_desc = 'Discover a device using alias, name, or UUID.';
 
-bluetooth_test(() => getHealthThermometerDevice()
+bluetooth_test(() => getConnectedHealthThermometerDevice()
     // Chrome will always close the previous chooser in the process of handling
     // a user gesture for the next request, so these need to be done
     // sequentially.

third_party/WebKit/LayoutTests/external/wpt/bluetooth/requestDevice/request-from-sandboxed-iframe.https.html

@@ -14,7 +14,7 @@ const expected = 'SecurityError: requestDevice() called from cross-origin ' +
 
 let iframe = document.createElement('iframe');
 
-bluetooth_test(() => getHealthThermometerDevice()
+bluetooth_test(() => getConnectedHealthThermometerDevice()
     // 1. Load the iframe.
     .then(() => new Promise(resolve => {
       iframe.sandbox.add('allow-scripts');

third_party/WebKit/LayoutTests/external/wpt/bluetooth/resources/bluetooth-helpers.js

@@ -66,7 +66,9 @@ function bluetooth_test(func, name, properties) {
     .then(() => promise_test(t => Promise.resolve()
       // Trigger Chromium-specific setup.
       .then(performChromiumSetup)
-      .then(() => func(t)), name, properties));
+      .then(() => func(t))
+      .then(() => navigator.bluetooth.test.allResponsesConsumed())
+      .then(consumed => assert_true(consumed)), name, properties));
 }
 
 // HCI Error Codes. Used for simulateGATT[Dis]ConnectionResponse.
@@ -926,42 +928,53 @@ function getEmptyHealthThermometerService(options) {
 // The primary service with 'device_information' UUID has a characteristics
 // with UUID 'serial_number_string'. The device has been connected to and its
 // attributes are ready to be discovered.
-// TODO(crbug.com/719816): Add descriptors.
 function getHIDDevice(options) {
+  let device, fake_peripheral;
+  return getConnectedHIDDevice(options)
+    .then(_ => ({device, fake_peripheral} = _))
+    .then(() => fake_peripheral.setNextGATTDiscoveryResponse({
+      code: HCI_SUCCESS,
+    }))
+    .then(() => ({device, fake_peripheral}));
+}
+
+// Similar to getHealthThermometerDevice except the GATT discovery
+// response has not been set yet so more attributes can still be added.
+// TODO(crbug.com/719816): Add descriptors.
+function getConnectedHIDDevice(options) {
+  let device, fake_peripheral;
   return setUpPreconnectedDevice({
       address: '10:10:10:10:10:10',
       name: 'HID Device',
       knownServiceUUIDs: [
         'generic_access',
         'device_information',
-        'human_interface_device'
+        'human_interface_device',
       ],
     })
-    .then(fake_peripheral => {
-      return requestDeviceWithTrustedClick(options)
-        .then(device => {
-          return fake_peripheral
-            .setNextGATTConnectionResponse({
-              code: HCI_SUCCESS})
-            .then(() => device.gatt.connect())
-            .then(() => fake_peripheral.addFakeService({
-              uuid: 'generic_access'}))
-            .then(() => fake_peripheral.addFakeService({
-              uuid: 'device_information'}))
-            // Blocklisted Characteristic:
-            // https://github.com/WebBluetoothCG/registries/blob/master/gatt_blocklist.txt
-            .then(dev_info => dev_info.addFakeCharacteristic({
-              uuid: 'serial_number_string', properties: ['read']}))
-            .then(() => fake_peripheral.addFakeService({
-              uuid: 'human_interface_device'}))
-            .then(() => fake_peripheral.setNextGATTDiscoveryResponse({
-              code: HCI_SUCCESS}))
-            .then(() => ({
-              device: device,
-              fake_peripheral: fake_peripheral
-            }));
-        });
-    });
+    .then(_ => (fake_peripheral = _))
+    .then(() => requestDeviceWithTrustedClick(options))
+    .then(_ => (device = _))
+    .then(() => fake_peripheral.setNextGATTConnectionResponse({
+      code: HCI_SUCCESS,
+    }))
+    .then(() => device.gatt.connect())
+    .then(() => fake_peripheral.addFakeService({
+      uuid: 'generic_access',
+    }))
+    .then(() => fake_peripheral.addFakeService({
+      uuid: 'device_information',
+    }))
+    // Blocklisted Characteristic:
+    // https://github.com/WebBluetoothCG/registries/blob/master/gatt_blocklist.txt
+    .then(dev_info => dev_info.addFakeCharacteristic({
+      uuid: 'serial_number_string',
+      properties: ['read'],
+    }))
+    .then(() => fake_peripheral.addFakeService({
+      uuid: 'human_interface_device',
+    }))
+    .then(() => ({device, fake_peripheral}));
 }
 
 // Similar to getHealthThermometerDevice() except the device

third_party/WebKit/LayoutTests/external/wpt/bluetooth/script-tests/server/disconnect-called-before.js

@@ -7,7 +7,7 @@ const expected = new DOMException(
     'NetworkError');
 let device;
 
-bluetooth_test(() => getHealthThermometerDevice({
+bluetooth_test(() => getConnectedHealthThermometerDevice({
       filters: [{services: ['health_thermometer']}],
       optionalServices: ['generic_access']
     })

third_party/WebKit/LayoutTests/external/wpt/bluetooth/script-tests/server/invalid-service-name.js

@@ -11,7 +11,7 @@ const expected = new DOMException(
     " e.g. 'alert_notification'.",
     'TypeError');
 
-bluetooth_test(() => getHealthThermometerDevice()
+bluetooth_test(() => getConnectedHealthThermometerDevice()
     .then(({device}) => assert_promise_rejects_with_message(
         device.gatt.CALLS([
           getPrimaryService('wrong_name')|

third_party/WebKit/LayoutTests/external/wpt/bluetooth/script-tests/server/no-permission-absent-service.js

@@ -7,7 +7,7 @@ const expected = new DOMException(
     'https://goo.gl/HxfxSQ',
     'SecurityError');
 
-bluetooth_test(() => getHealthThermometerDevice({
+bluetooth_test(() => getConnectedHealthThermometerDevice({
       filters: [{services: ['health_thermometer']}]
     })
     .then(({device}) => Promise.all([

third_party/WebKit/LayoutTests/external/wpt/bluetooth/script-tests/server/no-permission-for-any-service.js

@@ -7,7 +7,7 @@ const expected = new DOMException(
     'https://goo.gl/HxfxSQ',
      'SecurityError');
 
-bluetooth_test(() => getHealthThermometerDevice({acceptAllDevices: true})
+bluetooth_test(() => getConnectedHealthThermometerDevice({acceptAllDevices: true})
     .then(({device}) => assert_promise_rejects_with_message(
         device.gatt.CALLS([
           getPrimaryService('heart_rate')|

third_party/WebKit/LayoutTests/external/wpt/bluetooth/script-tests/server/no-permission-present-service.js

@@ -6,7 +6,7 @@ const expected = new DOMException(
     'to \'optionalServices\' in requestDevice() options. https://goo.gl/HxfxSQ',
     'SecurityError');
 
-bluetooth_test(() => getHealthThermometerDevice({
+bluetooth_test(() => getConnectedHealthThermometerDevice({
       filters: [{services: ['health_thermometer']}]
     })
     .then(({device}) => Promise.all([

third_party/WebKit/LayoutTests/external/wpt/bluetooth/server/getPrimaryService/gen-disconnect-called-before.https.html

@@ -15,7 +15,7 @@ const expected = new DOMException(
     'NetworkError');
 let device;
 
-bluetooth_test(() => getHealthThermometerDevice({
+bluetooth_test(() => getConnectedHealthThermometerDevice({
       filters: [{services: ['health_thermometer']}],
       optionalServices: ['generic_access']
     })

third_party/WebKit/LayoutTests/external/wpt/bluetooth/server/getPrimaryService/gen-invalid-service-name.https.html

@@ -19,7 +19,7 @@ const expected = new DOMException(
     " e.g. 'alert_notification'.",
     'TypeError');
 
-bluetooth_test(() => getHealthThermometerDevice()
+bluetooth_test(() => getConnectedHealthThermometerDevice()
     .then(({device}) => assert_promise_rejects_with_message(
         device.gatt.getPrimaryService('wrong_name'),
         expected,

third_party/WebKit/LayoutTests/external/wpt/bluetooth/server/getPrimaryService/gen-no-permission-absent-service.https.html

@@ -15,7 +15,7 @@ const expected = new DOMException(
     'https://goo.gl/HxfxSQ',
     'SecurityError');
 
-bluetooth_test(() => getHealthThermometerDevice({
+bluetooth_test(() => getConnectedHealthThermometerDevice({
       filters: [{services: ['health_thermometer']}]
     })
     .then(({device}) => Promise.all([

third_party/WebKit/LayoutTests/external/wpt/bluetooth/server/getPrimaryService/gen-no-permission-for-any-service.https.html

@@ -15,7 +15,7 @@ const expected = new DOMException(
     'https://goo.gl/HxfxSQ',
      'SecurityError');
 
-bluetooth_test(() => getHealthThermometerDevice({acceptAllDevices: true})
+bluetooth_test(() => getConnectedHealthThermometerDevice({acceptAllDevices: true})
     .then(({device}) => assert_promise_rejects_with_message(
         device.gatt.getPrimaryService('heart_rate'),
         expected)),

third_party/WebKit/LayoutTests/external/wpt/bluetooth/server/getPrimaryService/gen-no-permission-present-service.https.html

@@ -14,7 +14,7 @@ const expected = new DOMException(
     'to \'optionalServices\' in requestDevice() options. https://goo.gl/HxfxSQ',
     'SecurityError');
 
-bluetooth_test(() => getHealthThermometerDevice({
+bluetooth_test(() => getConnectedHealthThermometerDevice({
       filters: [{services: ['health_thermometer']}]
     })
     .then(({device}) => Promise.all([

third_party/WebKit/LayoutTests/external/wpt/bluetooth/server/getPrimaryServices/blocklisted-services-with-uuid.https.html

@@ -12,7 +12,7 @@ const expected = new DOMException(
     'UUID to \'optionalServices\' in requestDevice() options. ' +
     'https://goo.gl/HxfxSQ', 'SecurityError');
 
-bluetooth_test(() => getHIDDevice({
+bluetooth_test(() => getConnectedHIDDevice({
   filters: [{services: ['device_information']}],
   optionalServices: ['human_interface_device']
 })

third_party/WebKit/LayoutTests/external/wpt/bluetooth/server/getPrimaryServices/gen-disconnect-called-before-with-uuid.https.html

@@ -15,7 +15,7 @@ const expected = new DOMException(
     'NetworkError');
 let device;
 
-bluetooth_test(() => getHealthThermometerDevice({
+bluetooth_test(() => getConnectedHealthThermometerDevice({
       filters: [{services: ['health_thermometer']}],
       optionalServices: ['generic_access']
     })

third_party/WebKit/LayoutTests/external/wpt/bluetooth/server/getPrimaryServices/gen-disconnect-called-before.https.html

@@ -15,7 +15,7 @@ const expected = new DOMException(
     'NetworkError');
 let device;
 
-bluetooth_test(() => getHealthThermometerDevice({
+bluetooth_test(() => getConnectedHealthThermometerDevice({
       filters: [{services: ['health_thermometer']}],
       optionalServices: ['generic_access']
     })

third_party/WebKit/LayoutTests/external/wpt/bluetooth/server/getPrimaryServices/gen-invalid-service-name.https.html

@@ -19,7 +19,7 @@ const expected = new DOMException(
     " e.g. 'alert_notification'.",
     'TypeError');
 
-bluetooth_test(() => getHealthThermometerDevice()
+bluetooth_test(() => getConnectedHealthThermometerDevice()
     .then(({device}) => assert_promise_rejects_with_message(
         device.gatt.getPrimaryServices('wrong_name'),
         expected,

third_party/WebKit/LayoutTests/external/wpt/bluetooth/server/getPrimaryServices/gen-no-permission-absent-service-with-uuid.https.html

@@ -15,7 +15,7 @@ const expected = new DOMException(
     'https://goo.gl/HxfxSQ',
     'SecurityError');
 
-bluetooth_test(() => getHealthThermometerDevice({
+bluetooth_test(() => getConnectedHealthThermometerDevice({
       filters: [{services: ['health_thermometer']}]
     })
     .then(({device}) => Promise.all([

third_party/WebKit/LayoutTests/external/wpt/bluetooth/server/getPrimaryServices/gen-no-permission-for-any-service-with-uuid.https.html

@@ -15,7 +15,7 @@ const expected = new DOMException(
     'https://goo.gl/HxfxSQ',
      'SecurityError');
 
-bluetooth_test(() => getHealthThermometerDevice({acceptAllDevices: true})
+bluetooth_test(() => getConnectedHealthThermometerDevice({acceptAllDevices: true})
     .then(({device}) => assert_promise_rejects_with_message(
         device.gatt.getPrimaryServices('heart_rate'),
         expected)),

third_party/WebKit/LayoutTests/external/wpt/bluetooth/server/getPrimaryServices/gen-no-permission-for-any-service.https.html

@@ -15,7 +15,7 @@ const expected = new DOMException(
     'https://goo.gl/HxfxSQ',
      'SecurityError');
 
-bluetooth_test(() => getHealthThermometerDevice({acceptAllDevices: true})
+bluetooth_test(() => getConnectedHealthThermometerDevice({acceptAllDevices: true})
     .then(({device}) => assert_promise_rejects_with_message(
         device.gatt.getPrimaryServices(),
         expected)),

third_party/WebKit/LayoutTests/external/wpt/bluetooth/server/getPrimaryServices/gen-no-permission-present-service-with-uuid.https.html

@@ -14,7 +14,7 @@ const expected = new DOMException(
     'to \'optionalServices\' in requestDevice() options. https://goo.gl/HxfxSQ',
     'SecurityError');
 
-bluetooth_test(() => getHealthThermometerDevice({
+bluetooth_test(() => getConnectedHealthThermometerDevice({
       filters: [{services: ['health_thermometer']}]
     })
     .then(({device}) => Promise.all([