| OLD | NEW |
|---|
| 1 <!DOCTYPE html> | 1 <!DOCTYPE html> |
| 2 <script src="../resources/testharness.js"></script> | 2 <script src="../resources/testharness.js"></script> |
| 3 <script src="../resources/testharnessreport.js"></script> | 3 <script src="../resources/testharnessreport.js"></script> |
| 4 <script src="../resources/mojo-helpers.js"></script> | 4 <script src="../resources/mojo-helpers.js"></script> |
| 5 <script src="resources/fake-devices.js"></script> | 5 <script src="resources/fake-devices.js"></script> |
| 6 <script src="resources/usb-helpers.js"></script> | 6 <script src="resources/usb-helpers.js"></script> |
| 7 <script> | 7 <script> |
| 8 'use strict'; | 8 'use strict'; |
| 9 | 9 |
| 10 function runIframeDisconnectTest(usb, onDeviceConnected) { | 10 function runIframeDisconnectTest(usb, onDeviceConnected) { |
| (...skipping 20 matching lines...) Expand all Loading... |
| 31 }); | 31 }); |
| 32 | 32 |
| 33 iframe.src = 'resources/open-in-iframe.html'; | 33 iframe.src = 'resources/open-in-iframe.html'; |
| 34 iframe.onload = () => { | 34 iframe.onload = () => { |
| 35 iframe.contentWindow.mojo.define( | 35 iframe.contentWindow.mojo.define( |
| 36 "Mojo Service Registry", | 36 "Mojo Service Registry", |
| 37 [ 'content/public/renderer/frame_interfaces' ], | 37 [ 'content/public/renderer/frame_interfaces' ], |
| 38 (frameInterfaces) => { | 38 (frameInterfaces) => { |
| 39 frameInterfaces.addInterfaceOverrideForTesting( | 39 frameInterfaces.addInterfaceOverrideForTesting( |
| 40 usb.DeviceManager.name, | 40 usb.DeviceManager.name, |
| 41 pipe => { mockDeviceManager.bindToPipe(pipe); }); | 41 handle => { mockDeviceManager.bindingSet.addBinding( |
| 42 mockDeviceManager, handle); }); |
| 42 iframe.contentWindow.postMessage('Ready', '*'); | 43 iframe.contentWindow.postMessage('Ready', '*'); |
| 43 }); | 44 }); |
| 44 } | 45 } |
| 45 document.body.appendChild(iframe); | 46 document.body.appendChild(iframe); |
| 46 }); | 47 }); |
| 47 } | 48 } |
| 48 | 49 |
| 49 usb_test(usb => { | 50 usb_test(usb => { |
| 50 return runIframeDisconnectTest(usb, iframe => { | 51 return runIframeDisconnectTest(usb, iframe => { |
| 51 document.body.removeChild(iframe); | 52 document.body.removeChild(iframe); |
| (...skipping 24 matching lines...) Expand all Loading... |
| 76 }; | 77 }; |
| 77 | 78 |
| 78 iframe.src = 'resources/open-in-iframe.html'; | 79 iframe.src = 'resources/open-in-iframe.html'; |
| 79 iframe.onload = () => { | 80 iframe.onload = () => { |
| 80 iframe.contentWindow.mojo.define( | 81 iframe.contentWindow.mojo.define( |
| 81 "Mojo Service Registry", | 82 "Mojo Service Registry", |
| 82 [ 'content/public/renderer/frame_interfaces' ], | 83 [ 'content/public/renderer/frame_interfaces' ], |
| 83 (frameInterfaces) => { | 84 (frameInterfaces) => { |
| 84 frameInterfaces.addInterfaceOverrideForTesting( | 85 frameInterfaces.addInterfaceOverrideForTesting( |
| 85 usb.DeviceManager.name, | 86 usb.DeviceManager.name, |
| 86 pipe => { mockDeviceManager.bindToPipe(pipe); }); | 87 handle => { mockDeviceManager.bindingSet.addBinding( |
| 88 mockDeviceManager, handle); }); |
| 87 iframe.contentWindow.postMessage('Ready', '*'); | 89 iframe.contentWindow.postMessage('Ready', '*'); |
| 88 }); | 90 }); |
| 89 } | 91 } |
| 90 document.body.appendChild(iframe); | 92 document.body.appendChild(iframe); |
| 91 }); | 93 }); |
| 92 }, 'events are not delivered to detached frames'); | 94 }, 'events are not delivered to detached frames'); |
| 93 </script> | 95 </script> |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2594213002:
Mojo JS bindings: change usb layout tests to use the new "bindings" module. (Closed)
