| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 | 5 |
| 6 /** | 6 /** |
| 7 * This URL is defined in content/public/test/test_mojo_app.cc. It identifies | 7 * This URL is defined in content/public/test/test_mojo_app.cc. It identifies |
| 8 * content_shell's out-of-process Mojo test app. | 8 * content_shell's out-of-process Mojo test app. |
| 9 */ | 9 */ |
| 10 var TEST_APP_URL = 'system:content_mojo_test'; | 10 var TEST_APP_URL = 'system:content_mojo_test'; |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 var pipe = core.createMessagePipe(); | 23 var pipe = core.createMessagePipe(); |
| 24 var service = new iface.proxyClass(new router.Router(pipe.handle0)); | 24 var service = new iface.proxyClass(new router.Router(pipe.handle0)); |
| 25 serviceProvider.getInterface(iface.name, pipe.handle1); | 25 serviceProvider.getInterface(iface.name, pipe.handle1); |
| 26 return service; | 26 return service; |
| 27 }; | 27 }; |
| 28 | 28 |
| 29 return function() { | 29 return function() { |
| 30 domAutomationController.setAutomationId(0); | 30 domAutomationController.setAutomationId(0); |
| 31 var shellPipe = serviceRegistry.connectToService(shellMojom.Shell.name); | 31 var shellPipe = serviceRegistry.connectToService(shellMojom.Shell.name); |
| 32 var shell = new shellMojom.Shell.proxyClass(new router.Router(shellPipe)); | 32 var shell = new shellMojom.Shell.proxyClass(new router.Router(shellPipe)); |
| 33 shell.connect(TEST_APP_URL, | 33 shell.connect(TEST_APP_URL, 1, |
| 34 function (services) { | 34 function (services) { |
| 35 var test = connectToService(services, testMojom.TestMojoService); | 35 var test = connectToService(services, testMojom.TestMojoService); |
| 36 test.getRequestorURL().then(function(response) { | 36 test.getRequestorURL().then(function(response) { |
| 37 domAutomationController.send( | 37 domAutomationController.send( |
| 38 response.url == 'chrome://mojo-web-ui/'); | 38 response.url == 'chrome://mojo-web-ui/'); |
| 39 }); | 39 }); |
| 40 }, | 40 }, |
| 41 function (exposedServices) {}, | 41 function (exposedServices) {}, |
| 42 new shellMojom.CapabilityFilter({ filter: new Map([["*", ["*"]]]) })); | 42 new shellMojom.CapabilityFilter({ filter: new Map([["*", ["*"]]]) })); |
| 43 }; | 43 }; |
| 44 }); | 44 }); |
| OLD | NEW |