Bluetooth: add Device events, and cleanup JS API

chrome/test/data/extensions/api_test/bluetooth/discovery_in_progress/runtest.js

Index: chrome/test/data/extensions/api_test/bluetooth/discovery_in_progress/runtest.js
diff --git a/chrome/test/data/extensions/api_test/bluetooth/discovery_in_progress/runtest.js b/chrome/test/data/extensions/api_test/bluetooth/discovery_in_progress/runtest.js
index 1a0c14c9764044f185e1897ccf3cb0eac824f17a..cd2c436ee012313e513776eb3b4dcd0e0dd9a9e9 100644
--- a/chrome/test/data/extensions/api_test/bluetooth/discovery_in_progress/runtest.js
+++ b/chrome/test/data/extensions/api_test/bluetooth/discovery_in_progress/runtest.js
@@ -23,16 +23,17 @@ function sendReady(callback) {
   chrome.test.sendMessage('ready', callback);
 }
 
-function stopDiscoveryAndContinue() {
-  chrome.bluetooth.stopDiscovery();
-  sendReady(startTests);
-}
-
 var discoveredDevices = [];
 function recordDevice(device) {
   discoveredDevices.push(device);
 }
 
+function stopDiscoveryAndContinue() {
+  chrome.bluetooth.stopDiscovery();
+  chrome.bluetooth.onDeviceAdded.removeListener(recordDevice);
+  sendReady(startTests);
+}
+
+chrome.bluetooth.onDeviceAdded.addListener(recordDevice);
 chrome.bluetooth.startDiscovery(
-    { deviceCallback:recordDevice },
     function() { sendReady(stopDiscoveryAndContinue); });