bluetooth: Repopulate chooser with existing devices

third_party/WebKit/LayoutTests/bluetooth/requestDevice/restart-scan-includes-previous-device.html

Index: third_party/WebKit/LayoutTests/bluetooth/requestDevice/restart-scan-includes-previous-device.html
diff --git a/third_party/WebKit/LayoutTests/bluetooth/requestDevice/chooser-restarts-scan.html b/third_party/WebKit/LayoutTests/bluetooth/requestDevice/restart-scan-includes-previous-device.html
similarity index 61%
rename from third_party/WebKit/LayoutTests/bluetooth/requestDevice/chooser-restarts-scan.html
rename to third_party/WebKit/LayoutTests/bluetooth/requestDevice/restart-scan-includes-previous-device.html
index c5ebe85bf2dd5ddbc643c3903880e191c58ae810..46881ff335174cb3400939e81188fccf8cbd29c7 100644
--- a/third_party/WebKit/LayoutTests/bluetooth/requestDevice/chooser-restarts-scan.html
+++ b/third_party/WebKit/LayoutTests/bluetooth/requestDevice/restart-scan-includes-previous-device.html
@@ -9,28 +9,31 @@ promise_test(() => {
 
   // Open the chooser, looking for a Heart Rate device.
   let requestDevicePromise =
-    setBluetoothFakeAdapter('SecondDiscoveryFindsHeartRateAdapter')
+    setBluetoothFakeAdapter('HeartRateAdapter')
       .then(() => requestDeviceWithKeyDown({
         filters: [{services: ['heart_rate']}]
       }));
 
-  // The adapter finds nothing, so we just see discovery start and stop.
-  return getBluetoothManualChooserEvents(3).then(events => {
-    assert_array_equals(events,
-                        ['chooser-opened(file://)',
-                         'discovering',
-                         'discovery-idle',
-                        ]);
+  // The existing Heart Rate Device is added to the chooser.
+  return getBluetoothManualChooserEvents(4).then(events => {
+    assert_equals(events.length, 4, events);
+    assert_equals(events[0], 'chooser-opened(file://)');
+    let idsByName = new AddDeviceEventSet();
+    idsByName.assert_add_device_event(events[1]);
+    assert_true(idsByName.has('Heart Rate Device'));
+    assert_equals(events[2], 'discovering');
+    assert_equals(events[3], 'discovery-idle');
 
-    // On the second discovery, the adapter finds the Heart Rate device.
+    // After restarting a scan the existing device should be added to the
+    // chooser.
     testRunner.sendBluetoothManualChooserEvent('rescan', '');
     return getBluetoothManualChooserEvents(3);
   }).then(events => {
-    assert_equals(events.length, 3, events);
-    assert_equals(events[0], 'discovering', 'events[0]');
     let idsByName = new AddDeviceEventSet();
-    idsByName.assert_add_device_event(events[1]);
+    assert_equals(events.length, 3, events);
+    idsByName.assert_add_device_event(events[0]);
     assert_true(idsByName.has('Heart Rate Device'));
+    assert_equals(events[1], 'discovering', events[0]);
     assert_equals(events[2], 'discovery-idle');
 
     // Select it and let the test complete.
@@ -38,5 +41,5 @@ promise_test(() => {
                                                idsByName.get('Heart Rate Device'));
     return requestDevicePromise;
   }).then(device => assert_equals(device.name, 'Heart Rate Device'));
-}, 'The chooser can restart the BT scan.');
+}, 'The chooser shows previously discovered devices.');
 </script>