OLD | NEW |
1 'use strict'; | 1 'use strict'; |
2 | 2 |
3 let mockShareService = loadMojoModules( | 3 let mockShareService = loadMojoModules( |
4 'mockShareService', | 4 'mockShareService', |
5 ['mojo/public/js/router', | 5 ['mojo/public/js/router', |
6 'third_party/WebKit/public/platform/modules/webshare/webshare.mojom', | 6 'third_party/WebKit/public/platform/modules/webshare/webshare.mojom', |
7 ]).then(mojo => { | 7 ]).then(mojo => { |
8 let [router, webshare] = mojo.modules; | 8 let [router, webshare] = mojo.modules; |
9 | 9 |
10 class MockShareService extends webshare.ShareService.stubClass { | 10 class MockShareService extends webshare.ShareService.stubClass { |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
60 | 60 |
61 function share_test(func, name, properties) { | 61 function share_test(func, name, properties) { |
62 promise_test(t => mockShareService.then(mock => { | 62 promise_test(t => mockShareService.then(mock => { |
63 let mockPromise = mock.init_(); | 63 let mockPromise = mock.init_(); |
64 return Promise.race([func(t, mock), mockPromise]); | 64 return Promise.race([func(t, mock), mockPromise]); |
65 }), name, properties); | 65 }), name, properties); |
66 } | 66 } |
67 | 67 |
68 // Copied from resources/bluetooth/bluetooth-helpers.js. | 68 // Copied from resources/bluetooth/bluetooth-helpers.js. |
69 function callWithKeyDown(functionCalledOnKeyPress) { | 69 function callWithKeyDown(functionCalledOnKeyPress) { |
70 return new Promise(resolve => { | 70 return new Promise((resolve, reject) => { |
71 function onKeyPress() { | 71 function onKeyPress() { |
72 document.removeEventListener('keypress', onKeyPress, false); | 72 document.removeEventListener('keypress', onKeyPress, false); |
73 resolve(functionCalledOnKeyPress()); | 73 try { |
| 74 resolve(functionCalledOnKeyPress()); |
| 75 } catch (e) { |
| 76 reject(e); |
| 77 } |
74 } | 78 } |
75 document.addEventListener('keypress', onKeyPress, false); | 79 document.addEventListener('keypress', onKeyPress, false); |
76 | 80 |
77 eventSender.keyDown(' ', []); | 81 eventSender.keyDown(' ', []); |
78 }); | 82 }); |
79 } | 83 } |
OLD | NEW |