third_party/WebKit/LayoutTests/usb/usbDevice-iframe.html - Issue 2642873002: Moves mojo.define -> gin.define.

Side by Side Diff: third_party/WebKit/LayoutTests/usb/usbDevice-iframe.html

Issue 2642873002: Moves mojo.define -> gin.define. (Closed)

Patch Set: rebaseline Created 3 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

« no previous file with comments | « third_party/WebKit/LayoutTests/resources/mojo-helpers.js ('k') | third_party/WebKit/LayoutTests/virtual/stable/webexposed/global-interface-listing-expected.txt » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 14 matching lines...) Expand all Loading...
25 };	25 };

26	26

27 mockDeviceManager.setDeviceCloseHandler(info => {	27 mockDeviceManager.setDeviceCloseHandler(info => {

28 assert_equals(info, usb.fakeDevices[0]);	28 assert_equals(info, usb.fakeDevices[0]);

29 assert_true(opened);	29 assert_true(opened);

30 resolve();	30 resolve();

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.gin.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 handle => { mockDeviceManager.bindingSet.addBinding(	41 handle => { mockDeviceManager.bindingSet.addBinding(

42 mockDeviceManager, handle); });	42 mockDeviceManager, handle); });

43 iframe.contentWindow.postMessage('Ready', '*');	43 iframe.contentWindow.postMessage('Ready', '*');

44 });	44 });

45 }	45 }

(...skipping 25 matching lines...) Expand all Loading...
71 mockDeviceManager.addMockDevice(usb.fakeDevices[0]);	71 mockDeviceManager.addMockDevice(usb.fakeDevices[0]);

72 resolve();	72 resolve();

73 });	73 });

74 } else {	74 } else {

75 reject(messageEvent.data);	75 reject(messageEvent.data);

76 }	76 }

77 };	77 };

78	78

79 iframe.src = 'resources/open-in-iframe.html';	79 iframe.src = 'resources/open-in-iframe.html';

80 iframe.onload = () => {	80 iframe.onload = () => {

81 iframe.contentWindow.mojo.define(	81 iframe.contentWindow.gin.define(

82 "Mojo Service Registry",	82 "Mojo Service Registry",

83 [ 'content/public/renderer/frame_interfaces' ],	83 [ 'content/public/renderer/frame_interfaces' ],

84 (frameInterfaces) => {	84 (frameInterfaces) => {

85 frameInterfaces.addInterfaceOverrideForTesting(	85 frameInterfaces.addInterfaceOverrideForTesting(

86 usb.DeviceManager.name,	86 usb.DeviceManager.name,

87 handle => { mockDeviceManager.bindingSet.addBinding(	87 handle => { mockDeviceManager.bindingSet.addBinding(

88 mockDeviceManager, handle); });	88 mockDeviceManager, handle); });

89 iframe.contentWindow.postMessage('Ready', '*');	89 iframe.contentWindow.postMessage('Ready', '*');

90 });	90 });

91 }	91 }

92 document.body.appendChild(iframe);	92 document.body.appendChild(iframe);

93 });	93 });

94 }, 'events are not delivered to detached frames');	94 }, 'events are not delivered to detached frames');

95 </script>	95 </script>

OLD	NEW