Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(350)

Side by Side Diff: content/test/data/web_ui_mojo_shell_test.js

Issue 1457623004: Serve mojo WebUI resources from the same origin as the WebUI itself. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/renderer/mojo_context_state.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 17 matching lines...) Expand all
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 var urlRequest = new urlMojom.URLRequest({ url: TEST_APP_URL }); 33 var urlRequest = new urlMojom.URLRequest({ url: TEST_APP_URL });
34 shell.connectToApplication(urlRequest, 34 shell.connectToApplication(urlRequest,
35 function (services) { 35 function (services) {
36 var test = connectToService(services, testMojom.TestMojoService); 36 var test = connectToService(services, testMojom.TestMojoService);
37 test.getRequestorURL().then(function(response) { 37 test.getRequestorURL().then(function(response) {
38 // The requestor URL seen by the app should be localhost because the 38 domAutomationController.send(
39 // connection comes from this script hosted on the test server. 39 response.url == 'chrome://mojo-web-ui/');
40 domAutomationController.send(response.url == 'http://127.0.0.1/');
41 }); 40 });
42 }, 41 },
43 function (exposedServices) {}, 42 function (exposedServices) {},
44 new shellMojom.CapabilityFilter({ filter: new Map([["*", ["*"]]]) })); 43 new shellMojom.CapabilityFilter({ filter: new Map([["*", ["*"]]]) }));
45 }; 44 };
46 }); 45 });
OLDNEW
« no previous file with comments | « content/renderer/mojo_context_state.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698