Index: chrome/test/data/extensions/api_test/usb/device_handling/test.js |
diff --git a/chrome/test/data/extensions/api_test/usb/device_handling/test.js b/chrome/test/data/extensions/api_test/usb/device_handling/test.js |
index 55d657c1d71930aa99b9c968c17b4513a7b36e62..638c817a5e6660ac46642860c8c8f5bdfbfa80c0 100644 |
--- a/chrome/test/data/extensions/api_test/usb/device_handling/test.js |
+++ b/chrome/test/data/extensions/api_test/usb/device_handling/test.js |
@@ -4,40 +4,30 @@ |
var usb = chrome.usb; |
-var tests = [ |
- function explicitCloseDevice() { |
- usb.findDevices({vendorId: 0, productId: 0}, function(devices) { |
- usb.closeDevice(devices[0]); |
- chrome.test.succeed(); |
- }); |
- }, |
- function resetDevice() { |
- usb.findDevices({vendorId: 0, productId: 0}, function(devices) { |
- usb.resetDevice(devices[0], function(result) { |
- chrome.test.assertEq(result, true); |
- // Ensure the device is still open. |
- var transfer = { |
- direction: "out", |
- endpoint: 2, |
- data: new ArrayBuffer(1) |
- }; |
- usb.interruptTransfer(devices[0], transfer, function(result) { |
- // This is designed to fail. |
- usb.resetDevice(devices[0], function(result) { |
- chrome.test.assertEq(result, false); |
- usb.interruptTransfer(devices[0], transfer, function(result) { |
- chrome.test.assertEq(result, undefined); |
- chrome.test.assertEq( |
- chrome.runtime.lastError && chrome.runtime.lastError.message, |
- 'No such device.' |
- ); |
- chrome.test.succeed(); |
- }); |
- }); |
- }); |
+function getDevices() { |
+ usb.getDevices({ |
+ vendorId: 0, |
+ productId: 0 |
+ }, function(devices) { |
+ usb.openDevice({ |
+ device: devices[0].device |
+ }, function(handle) { |
+ usb.closeDevice({ |
+ handle: handle.handle |
}); |
+ chrome.test.succeed(); |
}); |
- }, |
-]; |
+ }); |
+} |
+ |
+function explicitCloseDevice() { |
+ usb.findDevices({ |
+ vendorId: 0, |
+ productId: 0 |
+ }, function(devices) { |
+ usb.closeDevice(devices[0]); |
+ chrome.test.succeed(); |
+ }); |
+} |
-chrome.test.runTests(tests); |
+chrome.test.runTests([getDevices, explicitCloseDevice]); |